cpython-lru_cache-weakref: Python/

annotate Python/_warnings.c @ 49955:878d40468c4e legacy-trunk

Issue #4384: Added logging integration with warnings module using captureWarnings(). This change includes a NullHandler which does nothing; it will be of use to library developers who want to avoid the "No handlers could be found for logger XXX" message which can appear if the library user doesn't configure logging.

author	Vinay Sajip <vinay_sajip@yahoo.co.uk>
date	Wed, 03 Dec 2008 23:22:58 +0000
parents	642f20b22577
children	130f1911d146 a60facc9f7cf

rev	line source
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	1 #include "Python.h"
48948 d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 47933 diff changeset	2 #include "code.h" /* For DeprecationWarning about adding 'line'. */
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	3 #include "frameobject.h"
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	4
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	5 #define MODULE_NAME "_warnings"
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	6 #define DEFAULT_ACTION_NAME "default_action"
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	7
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	8 PyDoc_STRVAR(warnings__doc__,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	9 MODULE_NAME " provides basic warning filtering support.\n"
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	10 "It is a helper module to speed up interpreter start-up.");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	11
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	12 /* Both 'filters' and 'onceregistry' can be set in warnings.py;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	13 get_warnings_attr() will reset these variables accordingly. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	14 static PyObject _filters; / List */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	15 static PyObject _once_registry; / Dict */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	16
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	17
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	18 static int
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	19 check_matched(PyObject obj, PyObject arg)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	20 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	21 PyObject *result;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	22 int rc;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	23
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	24 if (obj == Py_None)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	25 return 1;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	26 result = PyObject_CallMethod(obj, "match", "O", arg);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	27 if (result == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	28 return -1;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	29
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	30 rc = PyObject_IsTrue(result);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	31 Py_DECREF(result);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	32 return rc;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	33 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	34
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	35 /*
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	36 Returns a new reference.
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	37 A NULL return value can mean false or an error.
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	38 */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	39 static PyObject *
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	40 get_warnings_attr(const char *attr)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	41 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	42 static PyObject *warnings_str = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	43 PyObject *all_modules;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	44 PyObject *warnings_module;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	45 int result;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	46
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	47 if (warnings_str == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	48 warnings_str = PyString_InternFromString("warnings");
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	49 if (warnings_str == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	50 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	51 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	52
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	53 all_modules = PyImport_GetModuleDict();
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	54 result = PyDict_Contains(all_modules, warnings_str);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	55 if (result == -1 \|\| result == 0)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	56 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	57
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	58 warnings_module = PyDict_GetItem(all_modules, warnings_str);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	59 if (!PyObject_HasAttrString(warnings_module, attr))
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	60 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	61 return PyObject_GetAttrString(warnings_module, attr);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	62 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	63
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	64
46445 6e4ca9f72bba Correct a refleak found by "regrtest.py -R:: test_structmembers" Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46428 diff changeset	65 static PyObject *
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	66 get_once_registry(void)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	67 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	68 PyObject *registry;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	69
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	70 registry = get_warnings_attr("onceregistry");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	71 if (registry == NULL) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	72 if (PyErr_Occurred())
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	73 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	74 return _once_registry;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	75 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	76 Py_DECREF(_once_registry);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	77 _once_registry = registry;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	78 return registry;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	79 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	80
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	81
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	82 /* The item is a borrowed reference. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	83 static const char *
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	84 get_filter(PyObject category, PyObject text, Py_ssize_t lineno,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	85 PyObject module, PyObject *item)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	86 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	87 PyObject action, m, *d;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	88 Py_ssize_t i;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	89 PyObject *warnings_filters;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	90
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	91 warnings_filters = get_warnings_attr("filters");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	92 if (warnings_filters == NULL) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	93 if (PyErr_Occurred())
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	94 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	95 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	96 else {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	97 Py_DECREF(_filters);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	98 _filters = warnings_filters;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	99 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	100
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	101 if (!PyList_Check(_filters)) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	102 PyErr_SetString(PyExc_ValueError,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	103 MODULE_NAME ".filters must be a list");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	104 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	105 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	106
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	107 /* _filters could change while we are iterating over it. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	108 for (i = 0; i < PyList_GET_SIZE(_filters); i++) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	109 PyObject tmp_item, action, msg, cat, mod, ln_obj;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	110 Py_ssize_t ln;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	111 int is_subclass, good_msg, good_mod;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	112
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	113 tmp_item = *item = PyList_GET_ITEM(_filters, i);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	114 if (PyTuple_Size(tmp_item) != 5) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	115 PyErr_Format(PyExc_ValueError,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	116 MODULE_NAME ".filters item %zd isn't a 5-tuple", i);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	117 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	118 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	119
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	120 /* Python code: action, msg, cat, mod, ln = item */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	121 action = PyTuple_GET_ITEM(tmp_item, 0);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	122 msg = PyTuple_GET_ITEM(tmp_item, 1);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	123 cat = PyTuple_GET_ITEM(tmp_item, 2);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	124 mod = PyTuple_GET_ITEM(tmp_item, 3);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	125 ln_obj = PyTuple_GET_ITEM(tmp_item, 4);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	126
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	127 good_msg = check_matched(msg, text);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	128 good_mod = check_matched(mod, module);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	129 is_subclass = PyObject_IsSubclass(category, cat);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	130 ln = PyInt_AsSsize_t(ln_obj);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	131 if (good_msg == -1 \|\| good_mod == -1 \|\| is_subclass == -1 \|\|
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	132 (ln == -1 && PyErr_Occurred()))
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	133 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	134
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	135 if (good_msg && is_subclass && good_mod && (ln == 0 \|\| lineno == ln))
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	136 return PyString_AsString(action);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	137 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	138
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	139 m = PyImport_ImportModule(MODULE_NAME);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	140 if (m == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	141 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	142 d = PyModule_GetDict(m);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	143 Py_DECREF(m);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	144 if (d == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	145 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	146 action = PyDict_GetItemString(d, DEFAULT_ACTION_NAME);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	147 if (action != NULL)
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	148 return PyString_AsString(action);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	149
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	150 PyErr_SetString(PyExc_ValueError,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	151 MODULE_NAME "." DEFAULT_ACTION_NAME " not found");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	152 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	153 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	154
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	155 static int
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	156 already_warned(PyObject registry, PyObject key, int should_set)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	157 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	158 PyObject *already_warned;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	159
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	160 if (key == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	161 return -1;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	162
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	163 already_warned = PyDict_GetItem(registry, key);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	164 if (already_warned != NULL) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	165 int rc = PyObject_IsTrue(already_warned);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	166 if (rc != 0)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	167 return rc;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	168 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	169
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	170 /* This warning wasn't found in the registry, set it. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	171 if (should_set)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	172 return PyDict_SetItem(registry, key, Py_True);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	173 return 0;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	174 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	175
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	176 /* New reference. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	177 static PyObject *
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	178 normalize_module(PyObject *filename)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	179 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	180 PyObject *module;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	181 const char *mod_str;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	182 Py_ssize_t len;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	183
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	184 int rc = PyObject_IsTrue(filename);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	185 if (rc == -1)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	186 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	187 else if (rc == 0)
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	188 return PyString_FromString("<unknown>");
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	189
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	190 mod_str = PyString_AsString(filename);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	191 if (mod_str == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	192 return NULL;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	193 len = PyString_Size(filename);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	194 if (len < 0)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	195 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	196 if (len >= 3 &&
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	197 strncmp(mod_str + (len - 3), ".py", 3) == 0) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	198 module = PyString_FromStringAndSize(mod_str, len-3);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	199 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	200 else {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	201 module = filename;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	202 Py_INCREF(module);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	203 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	204 return module;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	205 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	206
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	207 static int
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	208 update_registry(PyObject registry, PyObject text, PyObject *category,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	209 int add_zero)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	210 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	211 PyObject altkey, zero = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	212 int rc;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	213
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	214 if (add_zero) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	215 zero = PyInt_FromLong(0);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	216 if (zero == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	217 return -1;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	218 altkey = PyTuple_Pack(3, text, category, zero);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	219 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	220 else
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	221 altkey = PyTuple_Pack(2, text, category);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	222
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	223 rc = already_warned(registry, altkey, 1);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	224 Py_XDECREF(zero);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	225 Py_XDECREF(altkey);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	226 return rc;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	227 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	228
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	229 static void
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	230 show_warning(PyObject filename, int lineno, PyObject text, PyObject
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	231 category, PyObject sourceline)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	232 {
46667 d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	233 PyObject *f_stderr;
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	234 PyObject *name;
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	235 char lineno_str[128];
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	236
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	237 PyOS_snprintf(lineno_str, sizeof(lineno_str), ":%d: ", lineno);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	238
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	239 name = PyObject_GetAttrString(category, "__name__");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	240 if (name == NULL) /* XXX Can an object lack a '__name__' attribute? */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	241 return;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	242
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	243 f_stderr = PySys_GetObject("stderr");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	244 if (f_stderr == NULL) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	245 fprintf(stderr, "lost sys.stderr\n");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	246 Py_DECREF(name);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	247 return;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	248 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	249
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	250 /* Print "filename:lineno: category: text\n" */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	251 PyFile_WriteObject(filename, f_stderr, Py_PRINT_RAW);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	252 PyFile_WriteString(lineno_str, f_stderr);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	253 PyFile_WriteObject(name, f_stderr, Py_PRINT_RAW);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	254 PyFile_WriteString(": ", f_stderr);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	255 PyFile_WriteObject(text, f_stderr, Py_PRINT_RAW);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	256 PyFile_WriteString("\n", f_stderr);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	257 Py_XDECREF(name);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	258
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	259 /* Print " source_line\n" */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	260 if (sourceline) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	261 char *source_line_str = PyString_AS_STRING(sourceline);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	262 while (source_line_str == ' ' \|\| source_line_str == '\t' \|\|
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	263 *source_line_str == '\014')
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	264 source_line_str++;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	265
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	266 PyFile_WriteString(source_line_str, f_stderr);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	267 PyFile_WriteString("\n", f_stderr);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	268 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	269 else
47933 4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47835 diff changeset	270 _Py_DisplaySourceLine(f_stderr, PyString_AS_STRING(filename),
4f804ee772eb #3342: In tracebacks, printed source lines were not indented since r62555. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 47835 diff changeset	271 lineno, 2);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	272 PyErr_Clear();
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	273 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	274
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	275 static PyObject *
46667 d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	276 warn_explicit(PyObject category, PyObject message,
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	277 PyObject *filename, int lineno,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	278 PyObject module, PyObject registry, PyObject *sourceline)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	279 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	280 PyObject key = NULL, text = NULL, result = NULL, lineno_obj = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	281 PyObject *item = Py_None;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	282 const char *action;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	283 int rc;
47835 dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	284
dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	285 if (registry && !PyDict_Check(registry) && (registry != Py_None)) {
dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	286 PyErr_SetString(PyExc_TypeError, "'registry' must be a dict");
dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	287 return NULL;
dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	288 }
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	289
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	290 /* Normalize module. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	291 if (module == NULL) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	292 module = normalize_module(filename);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	293 if (module == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	294 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	295 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	296 else
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	297 Py_INCREF(module);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	298
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	299 /* Normalize message. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	300 Py_INCREF(message); /* DECREF'ed in cleanup. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	301 rc = PyObject_IsInstance(message, PyExc_Warning);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	302 if (rc == -1) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	303 goto cleanup;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	304 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	305 if (rc == 1) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	306 text = PyObject_Str(message);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	307 category = (PyObject*)message->ob_type;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	308 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	309 else {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	310 text = message;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	311 message = PyObject_CallFunction(category, "O", message);
47835 dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	312 if (message == NULL)
dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	313 goto cleanup;
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	314 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	315
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	316 lineno_obj = PyInt_FromLong(lineno);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	317 if (lineno_obj == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	318 goto cleanup;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	319
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	320 /* Create key. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	321 key = PyTuple_Pack(3, text, category, lineno_obj);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	322 if (key == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	323 goto cleanup;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	324
47835 dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	325 if ((registry != NULL) && (registry != Py_None)) {
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	326 rc = already_warned(registry, key, 0);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	327 if (rc == -1)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	328 goto cleanup;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	329 else if (rc == 1)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	330 goto return_none;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	331 /* Else this warning hasn't been generated before. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	332 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	333
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	334 action = get_filter(category, text, lineno, module, &item);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	335 if (action == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	336 goto cleanup;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	337
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	338 if (strcmp(action, "error") == 0) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	339 PyErr_SetObject(category, message);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	340 goto cleanup;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	341 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	342
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	343 /* Store in the registry that we've been here, except when the action
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	344 is "always". */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	345 rc = 0;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	346 if (strcmp(action, "always") != 0) {
47835 dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	347 if (registry != NULL && registry != Py_None &&
dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	348 PyDict_SetItem(registry, key, Py_True) < 0)
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	349 goto cleanup;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	350 else if (strcmp(action, "ignore") == 0)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	351 goto return_none;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	352 else if (strcmp(action, "once") == 0) {
47835 dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	353 if (registry == NULL \|\| registry == Py_None) {
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	354 registry = get_once_registry();
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	355 if (registry == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	356 goto cleanup;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	357 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	358 /* _once_registry[(text, category)] = 1 */
46667 d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	359 rc = update_registry(registry, text, category, 0);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	360 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	361 else if (strcmp(action, "module") == 0) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	362 /* registry[(text, category, 0)] = 1 */
47835 dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	363 if (registry != NULL && registry != Py_None)
46667 d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	364 rc = update_registry(registry, text, category, 0);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	365 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	366 else if (strcmp(action, "default") != 0) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	367 PyObject *to_str = PyObject_Str(item);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	368 const char *err_str = "???";
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	369
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	370 if (to_str != NULL)
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	371 err_str = PyString_AS_STRING(to_str);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	372 PyErr_Format(PyExc_RuntimeError,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	373 "Unrecognized action (%s) in warnings.filters:\n %s",
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	374 action, err_str);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	375 Py_XDECREF(to_str);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	376 goto cleanup;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	377 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	378 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	379
49386 642f20b22577 Merged revisions 66748 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 48948 diff changeset	380 if (rc == 1) /* Already warned for this module. */
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	381 goto return_none;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	382 if (rc == 0) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	383 PyObject *show_fxn = get_warnings_attr("showwarning");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	384 if (show_fxn == NULL) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	385 if (PyErr_Occurred())
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	386 goto cleanup;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	387 show_warning(filename, lineno, text, category, sourceline);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	388 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	389 else {
46667 d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	390 const char *msg = "functions overriding warnings.showwarning() "
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	391 "must support the 'line' argument";
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	392 const char *text_char = PyString_AS_STRING(text);
46667 d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	393
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	394 if (strcmp(msg, text_char) == 0) {
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	395 /* Prevent infinite recursion by using built-in implementation
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	396 of showwarning(). */
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	397 show_warning(filename, lineno, text, category, sourceline);
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	398 }
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	399 else {
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	400 PyObject *check_fxn;
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	401 PyObject *defaults;
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	402 PyObject *res;
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	403
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	404 if (PyMethod_Check(show_fxn))
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	405 check_fxn = PyMethod_Function(show_fxn);
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	406 else if (PyFunction_Check(show_fxn))
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	407 check_fxn = show_fxn;
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	408 else {
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	409 PyErr_SetString(PyExc_TypeError,
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	410 "warnings.showwarning() must be set to a "
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	411 "function or method");
46696 9130b48a7130 Fix logic error in Python/_warnings.c and add a test to verify Benjamin Peterson <benjamin@python.org> parents: 46686 diff changeset	412 Py_DECREF(show_fxn);
9130b48a7130 Fix logic error in Python/_warnings.c and add a test to verify Benjamin Peterson <benjamin@python.org> parents: 46686 diff changeset	413 goto cleanup;
46667 d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	414 }
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	415
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	416 defaults = PyFunction_GetDefaults(check_fxn);
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	417 /* A proper implementation of warnings.showwarning() should
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	418 have at least two default arguments. */
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	419 if ((defaults == NULL) \|\| (PyTuple_Size(defaults) < 2)) {
48948 d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 47933 diff changeset	420 PyCodeObject code = (PyCodeObject )
d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 47933 diff changeset	421 PyFunction_GetCode(check_fxn);
d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 47933 diff changeset	422 if (!(code->co_flags & CO_VARARGS)) {
d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 47933 diff changeset	423 if (PyErr_WarnEx(PyExc_DeprecationWarning, msg, 1) <
d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 47933 diff changeset	424 0) {
d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 47933 diff changeset	425 Py_DECREF(show_fxn);
d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 47933 diff changeset	426 goto cleanup;
d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 47933 diff changeset	427 }
46985 d2c1ed408a1d Fix a refleak in the _warnings module. Georg Brandl <georg@python.org> parents: 46696 diff changeset	428 }
48948 d563621d76db Move test.test_support.catch_warning() to the warnings module, rename it Brett Cannon <bcannon@gmail.com> parents: 47933 diff changeset	429 }
46667 d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	430 res = PyObject_CallFunctionObjArgs(show_fxn, message, category,
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	431 filename, lineno_obj,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	432 NULL);
46667 d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	433 Py_DECREF(show_fxn);
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	434 Py_XDECREF(res);
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	435 if (res == NULL)
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	436 goto cleanup;
d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	437 }
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	438 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	439 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	440 else /* if (rc == -1) */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	441 goto cleanup;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	442
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	443 return_none:
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	444 result = Py_None;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	445 Py_INCREF(result);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	446
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	447 cleanup:
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	448 Py_XDECREF(key);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	449 Py_XDECREF(text);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	450 Py_XDECREF(lineno_obj);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	451 Py_DECREF(module);
47835 dc42efd728ee warnings.warn_explicit() did not have the proper TypeErrors in place to prevent Brett Cannon <bcannon@gmail.com> parents: 47527 diff changeset	452 Py_XDECREF(message);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	453 return result; /* Py_None or NULL. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	454 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	455
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	456 /* filename, module, and registry are new refs, globals is borrowed */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	457 /* Returns 0 on error (no new refs), 1 on success */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	458 static int
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	459 setup_context(Py_ssize_t stack_level, PyObject *filename, int lineno,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	460 PyObject module, PyObject registry)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	461 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	462 PyObject *globals;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	463
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	464 /* Setup globals and lineno. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	465 PyFrameObject *f = PyThreadState_GET()->frame;
46686 2f351fa53a6b Fix a bug in the handling of the stacklevel argument in warnings.warn() where Brett Cannon <bcannon@gmail.com> parents: 46667 diff changeset	466 while (--stack_level > 0 && f != NULL)
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	467 f = f->f_back;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	468
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	469 if (f == NULL) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	470 globals = PyThreadState_Get()->interp->sysdict;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	471 *lineno = 1;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	472 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	473 else {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	474 globals = f->f_globals;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	475 *lineno = PyCode_Addr2Line(f->f_code, f->f_lasti);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	476 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	477
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	478 *module = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	479
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	480 /* Setup registry. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	481 assert(globals != NULL);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	482 assert(PyDict_Check(globals));
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	483 *registry = PyDict_GetItemString(globals, "__warningregistry__");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	484 if (*registry == NULL) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	485 int rc;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	486
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	487 *registry = PyDict_New();
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	488 if (*registry == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	489 return 0;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	490
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	491 rc = PyDict_SetItemString(globals, "__warningregistry__", *registry);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	492 if (rc < 0)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	493 goto handle_error;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	494 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	495 else
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	496 Py_INCREF(*registry);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	497
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	498 /* Setup module. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	499 *module = PyDict_GetItemString(globals, "__name__");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	500 if (*module == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	501 *module = PyString_FromString("<string>");
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	502 if (*module == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	503 goto handle_error;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	504 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	505 else
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	506 Py_INCREF(*module);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	507
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	508 /* Setup filename. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	509 *filename = PyDict_GetItemString(globals, "__file__");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	510 if (*filename != NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	511 Py_ssize_t len = PyString_Size(*filename);
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	512 const char file_str = PyString_AsString(filename);
46634 cc66029d2efe Fix some indentation errors. Brett Cannon <bcannon@gmail.com> parents: 46622 diff changeset	513 if (file_str == NULL \|\| (len < 0 && PyErr_Occurred()))
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	514 goto handle_error;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	515
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	516 /* if filename.lower().endswith((".pyc", ".pyo")): */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	517 if (len >= 4 &&
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	518 file_str[len-4] == '.' &&
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	519 tolower(file_str[len-3]) == 'p' &&
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	520 tolower(file_str[len-2]) == 'y' &&
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	521 (tolower(file_str[len-1]) == 'c' \|\|
46634 cc66029d2efe Fix some indentation errors. Brett Cannon <bcannon@gmail.com> parents: 46622 diff changeset	522 tolower(file_str[len-1]) == 'o'))
cc66029d2efe Fix some indentation errors. Brett Cannon <bcannon@gmail.com> parents: 46622 diff changeset	523 {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	524 *filename = PyString_FromStringAndSize(file_str, len-1);
46634 cc66029d2efe Fix some indentation errors. Brett Cannon <bcannon@gmail.com> parents: 46622 diff changeset	525 if (*filename == NULL)
cc66029d2efe Fix some indentation errors. Brett Cannon <bcannon@gmail.com> parents: 46622 diff changeset	526 goto handle_error;
cc66029d2efe Fix some indentation errors. Brett Cannon <bcannon@gmail.com> parents: 46622 diff changeset	527 }
cc66029d2efe Fix some indentation errors. Brett Cannon <bcannon@gmail.com> parents: 46622 diff changeset	528 else
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	529 Py_INCREF(*filename);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	530 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	531 else {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	532 const char module_str = PyString_AsString(module);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	533 if (module_str && strcmp(module_str, "__main__") == 0) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	534 PyObject *argv = PySys_GetObject("argv");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	535 if (argv != NULL && PyList_Size(argv) > 0) {
46637 a859f835ef53 Fix the C implementation of 'warnings' to infer the filename of the module that Brett Cannon <bcannon@gmail.com> parents: 46634 diff changeset	536 int is_true;
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	537 *filename = PyList_GetItem(argv, 0);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	538 Py_INCREF(*filename);
46637 a859f835ef53 Fix the C implementation of 'warnings' to infer the filename of the module that Brett Cannon <bcannon@gmail.com> parents: 46634 diff changeset	539 /* If sys.argv[0] is false, then use '__main__'. */
a859f835ef53 Fix the C implementation of 'warnings' to infer the filename of the module that Brett Cannon <bcannon@gmail.com> parents: 46634 diff changeset	540 is_true = PyObject_IsTrue(*filename);
a859f835ef53 Fix the C implementation of 'warnings' to infer the filename of the module that Brett Cannon <bcannon@gmail.com> parents: 46634 diff changeset	541 if (is_true < 0) {
a859f835ef53 Fix the C implementation of 'warnings' to infer the filename of the module that Brett Cannon <bcannon@gmail.com> parents: 46634 diff changeset	542 Py_DECREF(*filename);
a859f835ef53 Fix the C implementation of 'warnings' to infer the filename of the module that Brett Cannon <bcannon@gmail.com> parents: 46634 diff changeset	543 goto handle_error;
a859f835ef53 Fix the C implementation of 'warnings' to infer the filename of the module that Brett Cannon <bcannon@gmail.com> parents: 46634 diff changeset	544 }
a859f835ef53 Fix the C implementation of 'warnings' to infer the filename of the module that Brett Cannon <bcannon@gmail.com> parents: 46634 diff changeset	545 else if (!is_true) {
a859f835ef53 Fix the C implementation of 'warnings' to infer the filename of the module that Brett Cannon <bcannon@gmail.com> parents: 46634 diff changeset	546 Py_DECREF(*filename);
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	547 *filename = PyString_FromString("__main__");
46637 a859f835ef53 Fix the C implementation of 'warnings' to infer the filename of the module that Brett Cannon <bcannon@gmail.com> parents: 46634 diff changeset	548 if (*filename == NULL)
a859f835ef53 Fix the C implementation of 'warnings' to infer the filename of the module that Brett Cannon <bcannon@gmail.com> parents: 46634 diff changeset	549 goto handle_error;
a859f835ef53 Fix the C implementation of 'warnings' to infer the filename of the module that Brett Cannon <bcannon@gmail.com> parents: 46634 diff changeset	550 }
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	551 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	552 else {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	553 /* embedded interpreters don't have sys.argv, see bug #839151 */
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	554 *filename = PyString_FromString("__main__");
46634 cc66029d2efe Fix some indentation errors. Brett Cannon <bcannon@gmail.com> parents: 46622 diff changeset	555 if (*filename == NULL)
cc66029d2efe Fix some indentation errors. Brett Cannon <bcannon@gmail.com> parents: 46622 diff changeset	556 goto handle_error;
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	557 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	558 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	559 if (*filename == NULL) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	560 filename = module;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	561 Py_INCREF(*filename);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	562 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	563 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	564
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	565 return 1;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	566
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	567 handle_error:
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	568 /* filename not XDECREF'ed here as there is no way to jump here with a
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	569 dangling reference. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	570 Py_XDECREF(*registry);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	571 Py_XDECREF(*module);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	572 return 0;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	573 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	574
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	575 static PyObject *
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	576 get_category(PyObject message, PyObject category)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	577 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	578 int rc;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	579
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	580 /* Get category. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	581 rc = PyObject_IsInstance(message, PyExc_Warning);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	582 if (rc == -1)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	583 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	584
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	585 if (rc == 1)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	586 category = (PyObject*)message->ob_type;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	587 else if (category == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	588 category = PyExc_UserWarning;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	589
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	590 /* Validate category. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	591 rc = PyObject_IsSubclass(category, PyExc_Warning);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	592 if (rc == -1)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	593 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	594 if (rc == 0) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	595 PyErr_SetString(PyExc_ValueError,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	596 "category is not a subclass of Warning");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	597 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	598 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	599
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	600 return category;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	601 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	602
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	603 static PyObject *
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	604 do_warn(PyObject message, PyObject category, Py_ssize_t stack_level)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	605 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	606 PyObject filename, module, registry, res;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	607 int lineno;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	608
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	609 if (!setup_context(stack_level, &filename, &lineno, &module, &registry))
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	610 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	611
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	612 res = warn_explicit(category, message, filename, lineno, module, registry,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	613 NULL);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	614 Py_DECREF(filename);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	615 Py_DECREF(registry);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	616 Py_DECREF(module);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	617 return res;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	618 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	619
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	620 static PyObject *
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	621 warnings_warn(PyObject self, PyObject args, PyObject *kwds)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	622 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	623 static char *kw_list[] = { "message", "category", "stacklevel", 0 };
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	624 PyObject message, category = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	625 Py_ssize_t stack_level = 1;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	626
46667 d9071fa8244a Add a DeprecationWarning for when warnings.showwarning() is set to a function Brett Cannon <bcannon@gmail.com> parents: 46637 diff changeset	627 if (!PyArg_ParseTupleAndKeywords(args, kwds, "O\|On:warn", kw_list,
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	628 &message, &category, &stack_level))
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	629 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	630
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	631 category = get_category(message, category);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	632 if (category == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	633 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	634 return do_warn(message, category, stack_level);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	635 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	636
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	637 static PyObject *
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	638 warnings_warn_explicit(PyObject self, PyObject args, PyObject *kwds)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	639 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	640 static char *kwd_list[] = {"message", "category", "filename", "lineno",
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	641 "module", "registry", "module_globals", 0};
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	642 PyObject *message;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	643 PyObject *category;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	644 PyObject *filename;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	645 int lineno;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	646 PyObject *module = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	647 PyObject *registry = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	648 PyObject *module_globals = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	649
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	650 if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOOi\|OOO:warn_explicit",
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	651 kwd_list, &message, &category, &filename, &lineno, &module,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	652 &registry, &module_globals))
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	653 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	654
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	655 if (module_globals) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	656 static PyObject *get_source_name = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	657 static PyObject *splitlines_name = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	658 PyObject *loader;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	659 PyObject *module_name;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	660 PyObject *source;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	661 PyObject *source_list;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	662 PyObject *source_line;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	663 PyObject *returned;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	664
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	665 if (get_source_name == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	666 get_source_name = PyString_InternFromString("get_source");
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	667 if (!get_source_name)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	668 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	669 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	670 if (splitlines_name == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	671 splitlines_name = PyString_InternFromString("splitlines");
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	672 if (!splitlines_name)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	673 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	674 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	675
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	676 /* Check/get the requisite pieces needed for the loader. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	677 loader = PyDict_GetItemString(module_globals, "__loader__");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	678 module_name = PyDict_GetItemString(module_globals, "__name__");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	679
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	680 if (loader == NULL \|\| module_name == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	681 goto standard_call;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	682
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	683 /* Make sure the loader implements the optional get_source() method. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	684 if (!PyObject_HasAttrString(loader, "get_source"))
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	685 goto standard_call;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	686 /* Call get_source() to get the source code. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	687 source = PyObject_CallMethodObjArgs(loader, get_source_name,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	688 module_name, NULL);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	689 if (!source)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	690 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	691 else if (source == Py_None) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	692 Py_DECREF(Py_None);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	693 goto standard_call;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	694 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	695
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	696 /* Split the source into lines. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	697 source_list = PyObject_CallMethodObjArgs(source, splitlines_name,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	698 NULL);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	699 Py_DECREF(source);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	700 if (!source_list)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	701 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	702
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	703 /* Get the source line. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	704 source_line = PyList_GetItem(source_list, lineno-1);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	705 if (!source_line) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	706 Py_DECREF(source_list);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	707 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	708 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	709
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	710 /* Handle the warning. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	711 returned = warn_explicit(category, message, filename, lineno, module,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	712 registry, source_line);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	713 Py_DECREF(source_list);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	714 return returned;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	715 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	716
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	717 standard_call:
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	718 return warn_explicit(category, message, filename, lineno, module,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	719 registry, NULL);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	720 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	721
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	722
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	723 /* Function to issue a warning message; may raise an exception. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	724 int
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	725 PyErr_WarnEx(PyObject category, const char text, Py_ssize_t stack_level)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	726 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	727 PyObject *res;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	728 PyObject *message = PyString_FromString(text);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	729 if (message == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	730 return -1;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	731
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	732 if (category == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	733 category = PyExc_RuntimeWarning;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	734
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	735 res = do_warn(message, category, stack_level);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	736 Py_DECREF(message);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	737 if (res == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	738 return -1;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	739 Py_DECREF(res);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	740
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	741 return 0;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	742 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	743
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	744 /* PyErr_Warn is only for backwards compatability and will be removed.
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	745 Use PyErr_WarnEx instead. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	746
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	747 #undef PyErr_Warn
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	748
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	749 PyAPI_FUNC(int)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	750 PyErr_Warn(PyObject category, char text)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	751 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	752 return PyErr_WarnEx(category, text, 1);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	753 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	754
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	755 /* Warning with explicit origin */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	756 int
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	757 PyErr_WarnExplicit(PyObject category, const char text,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	758 const char *filename_str, int lineno,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	759 const char module_str, PyObject registry)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	760 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	761 PyObject *res;
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	762 PyObject *message = PyString_FromString(text);
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	763 PyObject *filename = PyString_FromString(filename_str);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	764 PyObject *module = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	765 int ret = -1;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	766
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	767 if (message == NULL \|\| filename == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	768 goto exit;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	769 if (module_str != NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	770 module = PyString_FromString(module_str);
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	771 if (module == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	772 goto exit;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	773 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	774
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	775 if (category == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	776 category = PyExc_RuntimeWarning;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	777 res = warn_explicit(category, message, filename, lineno, module, registry,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	778 NULL);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	779 if (res == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	780 goto exit;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	781 Py_DECREF(res);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	782 ret = 0;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	783
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	784 exit:
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	785 Py_XDECREF(message);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	786 Py_XDECREF(module);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	787 Py_XDECREF(filename);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	788 return ret;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	789 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	790
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	791
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	792 PyDoc_STRVAR(warn_doc,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	793 "Issue a warning, or maybe ignore it or raise an exception.");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	794
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	795 PyDoc_STRVAR(warn_explicit_doc,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	796 "Low-level inferface to warnings functionality.");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	797
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	798 static PyMethodDef warnings_functions[] = {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	799 {"warn", (PyCFunction)warnings_warn, METH_VARARGS \| METH_KEYWORDS,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	800 warn_doc},
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	801 {"warn_explicit", (PyCFunction)warnings_warn_explicit,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	802 METH_VARARGS \| METH_KEYWORDS, warn_explicit_doc},
49386 642f20b22577 Merged revisions 66748 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 48948 diff changeset	803 /* XXX(brett.cannon): add showwarning? */
642f20b22577 Merged revisions 66748 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 48948 diff changeset	804 /* XXX(brett.cannon): Reasonable to add formatwarning? */
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	805 {NULL, NULL} /* sentinel */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	806 };
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	807
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	808
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	809 static PyObject *
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	810 create_filter(PyObject category, const char action)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	811 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	812 static PyObject *ignore_str = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	813 static PyObject *error_str = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	814 static PyObject *default_str = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	815 PyObject *action_obj = NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	816 PyObject lineno, result;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	817
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	818 if (!strcmp(action, "ignore")) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	819 if (ignore_str == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	820 ignore_str = PyString_InternFromString("ignore");
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	821 if (ignore_str == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	822 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	823 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	824 action_obj = ignore_str;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	825 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	826 else if (!strcmp(action, "error")) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	827 if (error_str == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	828 error_str = PyString_InternFromString("error");
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	829 if (error_str == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	830 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	831 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	832 action_obj = error_str;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	833 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	834 else if (!strcmp(action, "default")) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	835 if (default_str == NULL) {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	836 default_str = PyString_InternFromString("default");
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	837 if (default_str == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	838 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	839 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	840 action_obj = default_str;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	841 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	842 else {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	843 Py_FatalError("unknown action");
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	844 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	845
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	846 /* This assumes the line number is zero for now. */
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	847 lineno = PyInt_FromLong(0);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	848 if (lineno == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	849 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	850 result = PyTuple_Pack(5, action_obj, Py_None, category, Py_None, lineno);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	851 Py_DECREF(lineno);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	852 return result;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	853 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	854
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	855 static PyObject *
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	856 init_filters(void)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	857 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	858 PyObject *filters = PyList_New(3);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	859 const char *bytes_action;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	860 if (filters == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	861 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	862
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	863 PyList_SET_ITEM(filters, 0,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	864 create_filter(PyExc_PendingDeprecationWarning, "ignore"));
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	865 PyList_SET_ITEM(filters, 1, create_filter(PyExc_ImportWarning, "ignore"));
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	866 if (Py_BytesWarningFlag > 1)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	867 bytes_action = "error";
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	868 else if (Py_BytesWarningFlag)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	869 bytes_action = "default";
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	870 else
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	871 bytes_action = "ignore";
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	872 PyList_SET_ITEM(filters, 2, create_filter(PyExc_BytesWarning,
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	873 bytes_action));
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	874
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	875 if (PyList_GET_ITEM(filters, 0) == NULL \|\|
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	876 PyList_GET_ITEM(filters, 1) == NULL \|\|
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	877 PyList_GET_ITEM(filters, 2) == NULL) {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	878 Py_DECREF(filters);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	879 return NULL;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	880 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	881
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	882 return filters;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	883 }
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	884
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	885
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	886 PyMODINIT_FUNC
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	887 _PyWarnings_Init(void)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	888 {
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	889 PyObject m, default_action;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	890
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	891 m = Py_InitModule3(MODULE_NAME, warnings_functions, warnings__doc__);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	892 if (m == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	893 return;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	894
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	895 _filters = init_filters();
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	896 if (_filters == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	897 return;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	898 Py_INCREF(_filters);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	899 if (PyModule_AddObject(m, "filters", _filters) < 0)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	900 return;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	901
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	902 _once_registry = PyDict_New();
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	903 if (_once_registry == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	904 return;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	905 Py_INCREF(_once_registry);
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	906 if (PyModule_AddObject(m, "once_registry", _once_registry) < 0)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	907 return;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	908
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47321 diff changeset	909 default_action = PyString_InternFromString("default");
46414 840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	910 if (default_action == NULL)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	911 return;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	912 if (PyModule_AddObject(m, DEFAULT_ACTION_NAME, default_action) < 0)
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	913 return;
840064802952 Re-implement the 'warnings' module in C. This allows for usage of the Brett Cannon <bcannon@gmail.com> parents: diff changeset	914 }

Mercurial > cpython-lru_cache-weakref

annotate Python/_warnings.c @ 49955:878d40468c4e legacy-trunk