Mercurial > cpython-lru_cache-weakref

comparison Python/errors.c @ 46430:47d9bbe10897

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 62260-62261,62266,62271,62277-62279,62289-62290,62293-62298,62302-62306,62308,62311,62313-62315,62319-62321 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62260 | gregory.p.smith | 2008-04-10 01:11:56 +0200 (Thu, 10 Apr 2008) | 2 lines better diagnostics ........ r62261 | gregory.p.smith | 2008-04-10 01:16:37 +0200 (Thu, 10 Apr 2008) | 3 lines Raise SystemError when size < 0 is passed into PyString_FromStringAndSize, PyBytes_FromStringAndSize or PyUnicode_FromStringAndSize. [issue2587] ........ r62266 | neal.norwitz | 2008-04-10 07:46:39 +0200 (Thu, 10 Apr 2008) | 5 lines Remove the test file before writing it in case there is no write permission. This might help fix some of the failures on Windows box(es). It doesn't hurt either way and ensure the tests are a little more self contained (ie have less assumptions). ........ r62271 | gregory.p.smith | 2008-04-10 21:50:36 +0200 (Thu, 10 Apr 2008) | 2 lines get rid of assert (size >= 0) now that an explicit if (size < 0) is in the code. ........ r62277 | andrew.kuchling | 2008-04-10 23:27:10 +0200 (Thu, 10 Apr 2008) | 1 line Remove forward-looking statement ........ r62278 | andrew.kuchling | 2008-04-10 23:28:51 +0200 (Thu, 10 Apr 2008) | 1 line Add punctuation ........ r62279 | andrew.kuchling | 2008-04-10 23:29:01 +0200 (Thu, 10 Apr 2008) | 1 line Use issue directive ........ r62289 | thomas.heller | 2008-04-11 15:05:38 +0200 (Fri, 11 Apr 2008) | 3 lines Move backwards compatibility macro to the correct place; PyIndex_Check() was introduced in Python 2.5. ........ r62290 | thomas.heller | 2008-04-11 16:20:26 +0200 (Fri, 11 Apr 2008) | 2 lines Performance improvements. ........ r62293 | christian.heimes | 2008-04-12 15:03:03 +0200 (Sat, 12 Apr 2008) | 2 lines Applied patch #2617 from Frank Wierzbicki wit some extras from me -J and -X are now reserved for Jython and non-standard arguments (e.g. IronPython). I've added some extra comments to make sure the reservation don't get missed in the future. ........ r62294 | georg.brandl | 2008-04-12 20:11:18 +0200 (Sat, 12 Apr 2008) | 2 lines Use absolute path in sys.path. ........ r62295 | georg.brandl | 2008-04-12 20:36:09 +0200 (Sat, 12 Apr 2008) | 2 lines #2615: small consistency update by Jeroen Ruigrok van der Werven. ........ r62296 | georg.brandl | 2008-04-12 21:00:20 +0200 (Sat, 12 Apr 2008) | 2 lines Add Jeroen. ........ r62297 | georg.brandl | 2008-04-12 21:05:37 +0200 (Sat, 12 Apr 2008) | 2 lines Don't offend snake lovers. ........ r62298 | gregory.p.smith | 2008-04-12 22:37:48 +0200 (Sat, 12 Apr 2008) | 2 lines fix compiler warnings ........ r62302 | gregory.p.smith | 2008-04-13 00:24:04 +0200 (Sun, 13 Apr 2008) | 3 lines socket.error inherits from IOError, it no longer needs listing in the all_errors tuple. ........ r62303 | brett.cannon | 2008-04-13 01:44:07 +0200 (Sun, 13 Apr 2008) | 8 lines Re-implement the 'warnings' module in C. This allows for usage of the 'warnings' code in places where it was previously not possible (e.g., the parser). It could also potentially lead to a speed-up in interpreter start-up if the C version of the code (_warnings) is imported over the use of the Python version in key places. Closes issue #1631171. ........ r62304 | gregory.p.smith | 2008-04-13 02:03:25 +0200 (Sun, 13 Apr 2008) | 3 lines Adds a profile-opt target for easy compilation of a python binary using gcc's profile guided optimization. ........ r62305 | brett.cannon | 2008-04-13 02:18:44 +0200 (Sun, 13 Apr 2008) | 3 lines Fix a bug in PySys_HasWarnOption() where it was not properly checking the length of the list storing the warning options. ........ r62306 | brett.cannon | 2008-04-13 02:25:15 +0200 (Sun, 13 Apr 2008) | 2 lines Fix an accidental bug of an non-existent init function. ........ r62308 | andrew.kuchling | 2008-04-13 03:05:59 +0200 (Sun, 13 Apr 2008) | 1 line Mention -J, -X ........ r62311 | benjamin.peterson | 2008-04-13 04:20:05 +0200 (Sun, 13 Apr 2008) | 2 lines Give the "Interactive Interpreter Changes" section in 2.6 whatsnew a unique link name ........ r62313 | brett.cannon | 2008-04-13 04:42:36 +0200 (Sun, 13 Apr 2008) | 3 lines Fix test_warnings by making the state of things more consistent for each test when it is run. ........ r62314 | skip.montanaro | 2008-04-13 05:17:30 +0200 (Sun, 13 Apr 2008) | 2 lines spelling ........ r62315 | georg.brandl | 2008-04-13 09:07:44 +0200 (Sun, 13 Apr 2008) | 2 lines Fix markup. ........ r62319 | christian.heimes | 2008-04-13 11:30:17 +0200 (Sun, 13 Apr 2008) | 1 line Fix compiler warning Include/warnings.h:19:28: warning: no newline at end of file ........ r62320 | christian.heimes | 2008-04-13 11:33:24 +0200 (Sun, 13 Apr 2008) | 1 line Use PyString_InternFromString instead of PyString_FromString for static vars ........ r62321 | christian.heimes | 2008-04-13 11:37:05 +0200 (Sun, 13 Apr 2008) | 1 line Added new files to the pcbuild files ........
author Christian Heimes <christian@cheimes.de>
date Sun, 13 Apr 2008 13:53:33 +0000
parents b91ca87e6f32
children 7ba7901dad7f
comparison
equal deleted inserted replaced
46423:e0c3acb116a5 46430:47d9bbe10897
671 Py_XDECREF(tb); 671 Py_XDECREF(tb);
672 } 672 }
673 673
674 extern PyObject *PyModule_GetWarningsModule(void); 674 extern PyObject *PyModule_GetWarningsModule(void);
675 675
676 /* Function to issue a warning message; may raise an exception. */
677 int
678 PyErr_WarnEx(PyObject *category, const char *message, Py_ssize_t stack_level)
679 {
680 PyObject *dict, *func = NULL;
681 PyObject *warnings_module = PyModule_GetWarningsModule();
682
683 if (warnings_module != NULL) {
684 dict = PyModule_GetDict(warnings_module);
685 if (dict != NULL)
686 func = PyDict_GetItemString(dict, "warn");
687 }
688 if (func == NULL) {
689 PySys_WriteStderr("warning: %s\n", message);
690 return 0;
691 }
692 else {
693 PyObject *res;
694
695 if (category == NULL)
696 category = PyExc_RuntimeWarning;
697 res = PyObject_CallFunction(func, "sOn",
698 message, category, stack_level);
699 if (res == NULL)
700 return -1;
701 Py_DECREF(res);
702 return 0;
703 }
704 }
705
706 /* Warning with explicit origin */
707 int
708 PyErr_WarnExplicit(PyObject *category, const char *message,
709 const char *filename, int lineno,
710 const char *module, PyObject *registry)
711 {
712 PyObject *mod, *dict, *func = NULL;
713
714 mod = PyImport_ImportModuleNoBlock("warnings");
715 if (mod != NULL) {
716 dict = PyModule_GetDict(mod);
717 func = PyDict_GetItemString(dict, "warn_explicit");
718 Py_DECREF(mod);
719 }
720 if (func == NULL) {
721 PySys_WriteStderr("warning: %s\n", message);
722 return 0;
723 }
724 else {
725 PyObject *res;
726
727 if (category == NULL)
728 category = PyExc_RuntimeWarning;
729 if (registry == NULL)
730 registry = Py_None;
731 res = PyObject_CallFunction(func, "sOsizO", message, category,
732 filename, lineno, module, registry);
733 if (res == NULL)
734 return -1;
735 Py_DECREF(res);
736 return 0;
737 }
738 }
739
740 676
741 /* Set file and line information for the current exception. 677 /* Set file and line information for the current exception.
742 If the exception is not a SyntaxError, also sets additional attributes 678 If the exception is not a SyntaxError, also sets additional attributes
743 to make printing of exceptions believe it is a syntax error. */ 679 to make printing of exceptions believe it is a syntax error. */
744 680