cpython-lru_cache-weakref: Python/traceback.c annotate

annotate Python/traceback.c @ 40582:67287ca4e1e8

Merged revisions 53005-53303 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r53012 | walter.doerwald | 2006-12-12 22:55:31 +0100 (Tue, 12 Dec 2006) | 2 lines Fix typo. ........ r53023 | brett.cannon | 2006-12-13 23:31:37 +0100 (Wed, 13 Dec 2006) | 2 lines Remove an unneeded import of 'warnings'. ........ r53025 | brett.cannon | 2006-12-14 00:02:38 +0100 (Thu, 14 Dec 2006) | 2 lines Remove unneeded imports of 'warnings'. ........ r53026 | brett.cannon | 2006-12-14 00:09:53 +0100 (Thu, 14 Dec 2006) | 4 lines Add test.test_support.guard_warnings_filter . This function returns a context manager that protects warnings.filter from being modified once the context is exited. ........ r53029 | george.yoshida | 2006-12-14 03:22:44 +0100 (Thu, 14 Dec 2006) | 2 lines Note that guard_warnings_filter was added in 2.6 ........ r53031 | vinay.sajip | 2006-12-14 09:53:55 +0100 (Thu, 14 Dec 2006) | 1 line Added news on recent changes to logging ........ r53032 | andrew.kuchling | 2006-12-14 19:57:53 +0100 (Thu, 14 Dec 2006) | 1 line [Patch #1599256 from David Watson] check that os.fsync is available before using it ........ r53042 | kurt.kaiser | 2006-12-15 06:13:11 +0100 (Fri, 15 Dec 2006) | 6 lines 1. Avoid hang when encountering a duplicate in a completion list. Bug 1571112. 2. Duplicate some old entries from Python's NEWS to IDLE's NEWS.txt M AutoCompleteWindow.py M NEWS.txt ........ r53048 | andrew.kuchling | 2006-12-18 18:12:31 +0100 (Mon, 18 Dec 2006) | 1 line [Bug #1618083] Add missing word; make a few grammar fixes ........ r53050 | andrew.kuchling | 2006-12-18 18:16:05 +0100 (Mon, 18 Dec 2006) | 1 line Bump version ........ r53051 | andrew.kuchling | 2006-12-18 18:22:07 +0100 (Mon, 18 Dec 2006) | 1 line [Bug #1616726] Fix description of generator.close(); if you raise some random exception, the exception is raised and doesn't trigger a RuntimeError ........ r53052 | andrew.kuchling | 2006-12-18 18:38:14 +0100 (Mon, 18 Dec 2006) | 1 line Describe new methods in Queue module ........ r53053 | andrew.kuchling | 2006-12-18 20:22:24 +0100 (Mon, 18 Dec 2006) | 1 line [Patch #1615868 by Lars Gustaebel] Use Py_off_t to fix BZ2File.seek() for offsets > 2Gb ........ r53057 | andrew.kuchling | 2006-12-18 22:29:07 +0100 (Mon, 18 Dec 2006) | 1 line Fix markup ........ r53063 | thomas.wouters | 2006-12-19 09:17:50 +0100 (Tue, 19 Dec 2006) | 5 lines Make sre's SubPattern objects accept slice objects like it already accepts simple slices. ........ r53065 | andrew.kuchling | 2006-12-19 15:13:05 +0100 (Tue, 19 Dec 2006) | 6 lines [Patch #1618455 by Ben Maurer] Improve speed of HMAC by using str.translate() instead of a more general XOR that has to construct a list. Slightly modified from Maurer's patch: the _strxor() function is no longer necessary at all. ........ r53066 | andrew.kuchling | 2006-12-19 15:28:23 +0100 (Tue, 19 Dec 2006) | 9 lines [Bug #1613651] Document socket.recv_into, socket.recvfrom_into Also, the text for recvfrom told you to read recv() for an explanation of the 'flags' argument, but recv() just pointed you at the man page. Copied the man-page text to recvfrom(), recvfrom_into, recv_into to avoid the pointless redirection. I don't have LaTeX on this machine; hope my markup is OK. ........ r53067 | andrew.kuchling | 2006-12-19 15:29:04 +0100 (Tue, 19 Dec 2006) | 1 line Comment typo ........ r53068 | andrew.kuchling | 2006-12-19 16:11:41 +0100 (Tue, 19 Dec 2006) | 1 line [Patch #1617413 from Dug Song] Fix HTTP Basic authentication via HTTPS ........ r53071 | andrew.kuchling | 2006-12-19 16:18:12 +0100 (Tue, 19 Dec 2006) | 1 line [Patch #1600491 from Jim Jewett] Describe how to build help files on Windows ........ r53073 | andrew.kuchling | 2006-12-19 16:43:10 +0100 (Tue, 19 Dec 2006) | 6 lines [Patch #1587139 by kxroberto] Protect lock acquisition/release with try...finally to ensure the lock is always released. This could use the 'with' statement, but the patch uses 'finally'. 2.5 backport candidate. ........ r53074 | vinay.sajip | 2006-12-19 19:29:11 +0100 (Tue, 19 Dec 2006) | 1 line Updated documentation for findCaller() to indicate that a 3-tuple is now returned, rather than a 2-tuple. ........ r53090 | georg.brandl | 2006-12-19 23:06:46 +0100 (Tue, 19 Dec 2006) | 3 lines Patch #1484695: The tarfile module now raises a HeaderError exception if a buffer given to frombuf() is invalid. ........ r53099 | raymond.hettinger | 2006-12-20 07:42:06 +0100 (Wed, 20 Dec 2006) | 5 lines Bug #1590891: random.randrange don't return correct value for big number Needs to be backported. ........ r53106 | georg.brandl | 2006-12-20 12:55:16 +0100 (Wed, 20 Dec 2006) | 3 lines Testcase for patch #1484695. ........ r53110 | andrew.kuchling | 2006-12-20 20:48:20 +0100 (Wed, 20 Dec 2006) | 17 lines [Apply length-checking.diff from bug #1599254] Add length checking to single-file mailbox formats: before doing a flush() on a mailbox, seek to the end and verify its length is unchanged, raising ExternalClashError if the file's length has changed. This fix avoids potential data loss if some other process appends to the mailbox file after the table of contents has been generated; instead of overwriting the modified file, you'll get the exception. I also noticed that the self._lookup() call in self.flush() wasn't necessary (everything that sets self._pending to True also calls self.lookup()), and replaced it by an assertion. 2.5 backport candidate. ........ r53112 | andrew.kuchling | 2006-12-20 20:57:10 +0100 (Wed, 20 Dec 2006) | 1 line [Bug #1619674] Make sum() use the term iterable, not sequence ........ r53113 | andrew.kuchling | 2006-12-20 20:58:11 +0100 (Wed, 20 Dec 2006) | 1 line Two grammar fixes ........ r53115 | andrew.kuchling | 2006-12-20 21:11:12 +0100 (Wed, 20 Dec 2006) | 5 lines Some other built-in functions are described with 'sequence' arguments that should really be 'iterable'; this commit changes them. Did I miss any? Did I introduce any errors? ........ r53117 | andrew.kuchling | 2006-12-20 21:20:42 +0100 (Wed, 20 Dec 2006) | 1 line [Bug #1619680] in_dll() arguments are documented in the wrong order ........ r53120 | neal.norwitz | 2006-12-21 05:38:00 +0100 (Thu, 21 Dec 2006) | 1 line Lars asked for permission on on python-dev for work on tarfile.py ........ r53125 | andrew.kuchling | 2006-12-21 14:40:29 +0100 (Thu, 21 Dec 2006) | 1 line Mention the os.SEEK_* constants ........ r53129 | walter.doerwald | 2006-12-21 19:06:30 +0100 (Thu, 21 Dec 2006) | 2 lines Fix typo. ........ r53131 | thomas.heller | 2006-12-21 19:30:56 +0100 (Thu, 21 Dec 2006) | 3 lines Fix wrong markup of an argument in a method signature. Will backport. ........ r53137 | andrew.kuchling | 2006-12-22 01:50:56 +0100 (Fri, 22 Dec 2006) | 1 line Typo fix ........ r53139 | andrew.kuchling | 2006-12-22 14:25:02 +0100 (Fri, 22 Dec 2006) | 1 line [Bug #737202; fix from Titus Brown] Make CGIHTTPServer work for scripts in sub-directories ........ r53141 | andrew.kuchling | 2006-12-22 16:04:45 +0100 (Fri, 22 Dec 2006) | 6 lines [Bug #802128] Make the mode argument of dumbdbm actually work the way it's described, and add a test for it. 2.5 bugfix candidate, maybe; arguably this patch changes the API of dumbdbm and shouldn't be added in a point-release. ........ r53142 | andrew.kuchling | 2006-12-22 16:16:58 +0100 (Fri, 22 Dec 2006) | 6 lines [Bug #802128 continued] Modify mode depending on the process umask. Is there really no other way to read the umask than to set it? Hope this works on Windows... ........ r53145 | andrew.kuchling | 2006-12-22 17:43:26 +0100 (Fri, 22 Dec 2006) | 1 line [Bug #776202] Apply Walter Doerwald's patch to use text mode for encoded files ........ r53146 | andrew.kuchling | 2006-12-22 19:41:42 +0100 (Fri, 22 Dec 2006) | 9 lines [Patch #783050 from Patrick Lynch] The emulation of forkpty() is incorrect; the master should close the slave fd. Added a test to test_pty.py that reads from the master_fd after doing a pty.fork(); without the fix it hangs forever instead of raising an exception. (<crossing fingers for the buildbots>) 2.5 backport candidate. ........ r53147 | andrew.kuchling | 2006-12-22 20:06:16 +0100 (Fri, 22 Dec 2006) | 1 line [Patch #827559 from Chris Gonnerman] Make SimpleHTTPServer redirect when a directory URL is missing the trailing slash; this lets relative links work. ........ r53149 | andrew.kuchling | 2006-12-22 20:21:27 +0100 (Fri, 22 Dec 2006) | 1 line Darn; this test works when you run test_pty.py directly, but fails when regrtest runs it (the os.read() raises os.error). I can't figure out the cause, so am commenting out the test. ........ r53150 | andrew.kuchling | 2006-12-22 22:48:19 +0100 (Fri, 22 Dec 2006) | 1 line Frak; this test also fails ........ r53153 | lars.gustaebel | 2006-12-23 17:40:13 +0100 (Sat, 23 Dec 2006) | 5 lines Patch #1230446: tarfile.py: fix ExFileObject so that read() and tell() work correctly together with readline(). Will backport to 2.5. ........ r53155 | lars.gustaebel | 2006-12-23 18:57:23 +0100 (Sat, 23 Dec 2006) | 5 lines Patch #1262036: Prevent TarFiles from being added to themselves under certain conditions. Will backport to 2.5. ........ r53159 | andrew.kuchling | 2006-12-27 04:25:31 +0100 (Wed, 27 Dec 2006) | 4 lines [Part of patch #1182394] Move the HMAC blocksize to be a class-level constant; this allows changing it in a subclass. To accommodate this, copy() now uses __class__. Also add some text to a comment. ........ r53160 | andrew.kuchling | 2006-12-27 04:31:24 +0100 (Wed, 27 Dec 2006) | 1 line [Rest of patch #1182394] Add ._current() method so that we can use the written-in-C .hexdigest() method ........ r53161 | lars.gustaebel | 2006-12-27 11:30:46 +0100 (Wed, 27 Dec 2006) | 4 lines Patch #1504073: Fix tarfile.open() for mode "r" with a fileobj argument. Will backport to 2.5. ........ r53165 | neal.norwitz | 2006-12-28 05:39:20 +0100 (Thu, 28 Dec 2006) | 1 line Remove a stray (old) macro name left around (I guess) ........ r53188 | neal.norwitz | 2006-12-29 04:01:53 +0100 (Fri, 29 Dec 2006) | 1 line SF bug #1623890, fix argument name in docstring ........ r53200 | raymond.hettinger | 2006-12-30 05:01:17 +0100 (Sat, 30 Dec 2006) | 1 line For sets with cyclical reprs, emit an ellipsis instead of infinitely recursing. ........ r53232 | brett.cannon | 2007-01-04 01:23:49 +0100 (Thu, 04 Jan 2007) | 3 lines Add EnvironmentVarGuard to test.test_support. Provides a context manager to temporarily set or unset environment variables. ........ r53235 | neal.norwitz | 2007-01-04 07:25:31 +0100 (Thu, 04 Jan 2007) | 1 line SF #1627373, fix typo in CarbonEvt. ........ r53244 | raymond.hettinger | 2007-01-04 18:53:34 +0100 (Thu, 04 Jan 2007) | 1 line Fix stability of heapq's nlargest() and nsmallest(). ........ r53249 | martin.v.loewis | 2007-01-04 22:06:12 +0100 (Thu, 04 Jan 2007) | 3 lines Bug #1566280: Explicitly invoke threading._shutdown from Py_Main, to avoid relying on atexit. Will backport to 2.5. ........ r53252 | gregory.p.smith | 2007-01-05 02:59:42 +0100 (Fri, 05 Jan 2007) | 3 lines Support linking of the bsddb module against BerkeleyDB 4.5.x (will backport to 2.5) ........ r53253 | gregory.p.smith | 2007-01-05 03:06:17 +0100 (Fri, 05 Jan 2007) | 2 lines bump module version to match supported berkeleydb version ........ r53255 | neal.norwitz | 2007-01-05 06:25:22 +0100 (Fri, 05 Jan 2007) | 6 lines Prevent crash on shutdown which can occur if we are finalizing and the module dict has been cleared already and some object raises a warning (like in a __del__). Will backport. ........ r53258 | gregory.p.smith | 2007-01-05 08:21:35 +0100 (Fri, 05 Jan 2007) | 2 lines typo fix ........ r53260 | neal.norwitz | 2007-01-05 09:06:43 +0100 (Fri, 05 Jan 2007) | 1 line Add Collin Winter for access to update PEP 3107 ........ r53262 | andrew.kuchling | 2007-01-05 15:22:17 +0100 (Fri, 05 Jan 2007) | 1 line [Bug #1622533] Make docstrings raw strings because they contain control characters (\0, \1) ........ r53264 | andrew.kuchling | 2007-01-05 16:51:24 +0100 (Fri, 05 Jan 2007) | 1 line [Patch #1520904] Fix bsddb tests to write to the temp directory instead of the Lib/bsddb/test directory ........ r53279 | brett.cannon | 2007-01-05 22:45:09 +0100 (Fri, 05 Jan 2007) | 3 lines Silence a warning from gcc 4.0.1 by specifying a function's parameter list is 'void' instead of just a set of empty parentheses. ........ r53285 | raymond.hettinger | 2007-01-06 02:14:41 +0100 (Sat, 06 Jan 2007) | 2 lines SF# 1409443: Expand comment to cover the interaction between f->f_lasti and the PREDICT macros. ........ r53286 | anthony.baxter | 2007-01-06 05:45:54 +0100 (Sat, 06 Jan 2007) | 1 line update to (c) years to include 2007 ........ r53291 | neal.norwitz | 2007-01-06 22:24:35 +0100 (Sat, 06 Jan 2007) | 1 line Add Josiah to SF for maintaining asyncore/asynchat ........ r53293 | peter.astrand | 2007-01-07 09:53:46 +0100 (Sun, 07 Jan 2007) | 1 line Re-implemented fix for #1531862 once again, in a way that works with Python 2.2. Fixes bug #1603424. ........ r53295 | peter.astrand | 2007-01-07 15:34:16 +0100 (Sun, 07 Jan 2007) | 1 line Avoid O(N**2) bottleneck in _communicate_(). Fixes #1598181. ........ r53300 | raymond.hettinger | 2007-01-08 19:09:20 +0100 (Mon, 08 Jan 2007) | 1 line Fix zero-length corner case for iterating over a mutating deque. ........ r53301 | vinay.sajip | 2007-01-08 19:50:32 +0100 (Mon, 08 Jan 2007) | 4 lines Bare except clause removed from SMTPHandler.emit(). Now, only ImportError is trapped. Bare except clause removed from SocketHandler.createSocket(). Now, only socket.error is trapped. (SF #411881) ........ r53302 | vinay.sajip | 2007-01-08 19:51:46 +0100 (Mon, 08 Jan 2007) | 2 lines Bare except clause removed from LogRecord.__init__. Now, only ValueError, TypeError and AttributeError are trapped. (SF #411881) ........ r53303 | vinay.sajip | 2007-01-08 19:52:36 +0100 (Mon, 08 Jan 2007) | 1 line Added entries about removal of some bare except clauses from logging. ........

author	Thomas Wouters <thomas@python.org>
date	Tue, 09 Jan 2007 23:18:33 +0000
parents	f731859e9b3b
children	4aee3f672f77

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Traceback implementation */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	3
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	4 #include "Python.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	5
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 31739 diff changeset	6 #include "code.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	7 #include "frameobject.h"
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	8 #include "structmember.h"
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	9 #include "osdefs.h"
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	10 #include "traceback.h"
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	11
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	12 #define OFF(x) offsetof(PyTracebackObject, x)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	13
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	14 static struct memberlist tb_memberlist[] = {
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	15 {"tb_next", T_OBJECT, OFF(tb_next)},
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	16 {"tb_frame", T_OBJECT, OFF(tb_frame)},
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	17 {"tb_lasti", T_INT, OFF(tb_lasti)},
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	18 {"tb_lineno", T_INT, OFF(tb_lineno)},
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	19 {NULL} /* Sentinel */
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	20 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	21
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	22 static PyObject *
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	23 tb_getattr(PyTracebackObject tb, char name)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	24 {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	25 return PyMember_Get((char *)tb, tb_memberlist, name);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	26 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	27
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	28 static void
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	29 tb_dealloc(PyTracebackObject *tb)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	30 {
22650 2288c724fe2b Call PyObject_GC_UnTrack before putting an object on the list of trash. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21077 diff changeset	31 PyObject_GC_UnTrack(tb);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11294 diff changeset	32 Py_TRASHCAN_SAFE_BEGIN(tb)
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	33 Py_XDECREF(tb->tb_next);
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	34 Py_XDECREF(tb->tb_frame);
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	35 PyObject_GC_Del(tb);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11294 diff changeset	36 Py_TRASHCAN_SAFE_END(tb)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	37 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	38
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	39 static int
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	40 tb_traverse(PyTracebackObject tb, visitproc visit, void arg)
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	41 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	42 Py_VISIT(tb->tb_next);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	43 Py_VISIT(tb->tb_frame);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	44 return 0;
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	45 }
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	46
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	47 static void
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	48 tb_clear(PyTracebackObject *tb)
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	49 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	50 Py_CLEAR(tb->tb_next);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	51 Py_CLEAR(tb->tb_frame);
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	52 }
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	53
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	54 PyTypeObject PyTraceBack_Type = {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	55 PyObject_HEAD_INIT(&PyType_Type)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	56 0,
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	57 "traceback",
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	58 sizeof(PyTracebackObject),
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	59 0,
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	60 (destructor)tb_dealloc, /tp_dealloc/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	61 0, /tp_print/
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	62 (getattrfunc)tb_getattr, /tp_getattr/
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	63 0, /tp_setattr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	64 0, /tp_compare/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	65 0, /tp_repr/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	66 0, /tp_as_number/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	67 0, /tp_as_sequence/
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	68 0, /tp_as_mapping/
20623 4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	69 0, /* tp_hash */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	70 0, /* tp_call */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	71 0, /* tp_str */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	72 0, /* tp_getattro */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	73 0, /* tp_setattro */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	74 0, /* tp_as_buffer */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	75 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	76 0, /* tp_doc */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	77 (traverseproc)tb_traverse, /* tp_traverse */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	78 (inquiry)tb_clear, /* tp_clear */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	79 0, /* tp_richcompare */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	80 0, /* tp_weaklistoffset */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	81 0, /* tp_iter */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	82 0, /* tp_iternext */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	83 0, /* tp_methods */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	84 0, /* tp_members */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	85 0, /* tp_getset */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	86 0, /* tp_base */
4fb7727e4f47 Make traceback objects collectable. Jeremy Hylton <jeremy@alum.mit.edu> parents: 20618 diff changeset	87 0, /* tp_dict */
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	88 };
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	89
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	90 static PyTracebackObject *
49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	91 newtracebackobject(PyTracebackObject next, PyFrameObject frame)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	92 {
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	93 PyTracebackObject *tb;
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	94 if ((next != NULL && !PyTraceBack_Check(next)) \|\|
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	95 frame == NULL \|\| !PyFrame_Check(frame)) {
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	96 PyErr_BadInternalCall();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	97 return NULL;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	98 }
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	99 tb = PyObject_GC_New(PyTracebackObject, &PyTraceBack_Type);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	100 if (tb != NULL) {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	101 Py_XINCREF(next);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	102 tb->tb_next = next;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	103 Py_XINCREF(frame);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	104 tb->tb_frame = frame;
24844 cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 23029 diff changeset	105 tb->tb_lasti = frame->f_lasti;
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 23029 diff changeset	106 tb->tb_lineno = PyCode_Addr2Line(frame->f_code,
cf5928fab108 This is my patch Michael W. Hudson <mwh@python.net> parents: 23029 diff changeset	107 frame->f_lasti);
22650 2288c724fe2b Call PyObject_GC_UnTrack before putting an object on the list of trash. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 21077 diff changeset	108 PyObject_GC_Track(tb);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	109 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	110 return tb;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	111 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	112
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	113 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	114 PyTraceBack_Here(PyFrameObject *frame)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	115 {
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5404 diff changeset	116 PyThreadState *tstate = frame->f_tstate;
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	117 PyTracebackObject oldtb = (PyTracebackObject ) tstate->curexc_traceback;
49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	118 PyTracebackObject *tb = newtracebackobject(oldtb, frame);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	119 if (tb == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	120 return -1;
5405 b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5404 diff changeset	121 tstate->curexc_traceback = (PyObject *)tb;
b7871ca930ad Massive changes for separate thread state management. Guido van Rossum <guido@python.org> parents: 5404 diff changeset	122 Py_XDECREF(oldtb);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	123 return 0;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	124 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	125
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	126 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	127 tb_displayline(PyObject f, char filename, int lineno, char *name)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	128 {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	129 int err = 0;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	130 FILE *xfp;
21057 2c0a9a5086e1 SF bug 485175: buffer overflow in traceback.c. Tim Peters <tim.peters@gmail.com> parents: 20623 diff changeset	131 char linebuf[2000];
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	132 int i;
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	133 if (filename == NULL \|\| name == NULL)
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	134 return -1;
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	135 /* This is needed by Emacs' compile command */
21057 2c0a9a5086e1 SF bug 485175: buffer overflow in traceback.c. Tim Peters <tim.peters@gmail.com> parents: 20623 diff changeset	136 #define FMT " File \"%.500s\", line %d, in %.500s\n"
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22650 diff changeset	137 xfp = fopen(filename, "r" PY_STDIOTEXTMODE);
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	138 if (xfp == NULL) {
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	139 /* Search tail of filename in sys.path before giving up */
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	140 PyObject *path;
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	141 char *tail = strrchr(filename, SEP);
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	142 if (tail == NULL)
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	143 tail = filename;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	144 else
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	145 tail++;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	146 path = PySys_GetObject("path");
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	147 if (path != NULL && PyList_Check(path)) {
36521 30aef3ce2b26 Use Py_ssize_t to count the Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	148 Py_ssize_t _npath = PyList_Size(path);
30aef3ce2b26 Use Py_ssize_t to count the Martin v. Löwis <martin@v.loewis.de> parents: 35742 diff changeset	149 int npath = Py_SAFE_DOWNCAST(_npath, Py_ssize_t, int);
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	150 size_t taillen = strlen(tail);
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	151 char namebuf[MAXPATHLEN+1];
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	152 for (i = 0; i < npath; i++) {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	153 PyObject *v = PyList_GetItem(path, i);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	154 if (v == NULL) {
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	155 PyErr_Clear();
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	156 break;
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	157 }
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	158 if (PyString_Check(v)) {
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	159 size_t len;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36877 diff changeset	160 len = PyString_GET_SIZE(v);
1909 0c232194a64f * Python/traceback.c: security fix -- check for buffer oveflow Guido van Rossum <guido@python.org> parents: 1831 diff changeset	161 if (len + 1 + taillen >= MAXPATHLEN)
0c232194a64f * Python/traceback.c: security fix -- check for buffer oveflow Guido van Rossum <guido@python.org> parents: 1831 diff changeset	162 continue; /* Too long */
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	163 strcpy(namebuf, PyString_AsString(v));
13096 8c8de5b736dc Trent Mick's Win64 changes: size_t vs. int or long; also some overflow Guido van Rossum <guido@python.org> parents: 12576 diff changeset	164 if (strlen(namebuf) != len)
1909 0c232194a64f * Python/traceback.c: security fix -- check for buffer oveflow Guido van Rossum <guido@python.org> parents: 1831 diff changeset	165 continue; /* v contains '\0' */
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	166 if (len > 0 && namebuf[len-1] != SEP)
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	167 namebuf[len++] = SEP;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	168 strcpy(namebuf+len, tail);
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22650 diff changeset	169 xfp = fopen(namebuf, "r" PY_STDIOTEXTMODE);
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	170 if (xfp != NULL) {
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	171 filename = namebuf;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	172 break;
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	173 }
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	174 }
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	175 }
4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	176 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	177 }
21077 379fc66f4c96 Use PyOS_snprintf instead of sprintf. Jeremy Hylton <jeremy@alum.mit.edu> parents: 21057 diff changeset	178 PyOS_snprintf(linebuf, sizeof(linebuf), FMT, filename, lineno, name);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	179 err = PyFile_WriteString(linebuf, f);
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36521 diff changeset	180 if (xfp == NULL)
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	181 return err;
36877 e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36521 diff changeset	182 else if (err != 0) {
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36521 diff changeset	183 fclose(xfp);
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36521 diff changeset	184 return err;
e9a7a2784e17 SF #1444030: Fix several potential defects found by Coverity. Hye-Shik Chang <hyeshik@gmail.com> parents: 36521 diff changeset	185 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	186 for (i = 0; i < lineno; i++) {
11294 d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	187 char* pLastChar = &linebuf[sizeof(linebuf)-2];
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	188 do {
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	189 *pLastChar = '\0';
23029 8291473fde3e Mass checkin of universal newline support. Jack Jansen <jack.jansen@cwi.nl> parents: 22650 diff changeset	190 if (Py_UniversalNewlineFgets(linebuf, sizeof linebuf, xfp, NULL) == NULL)
11294 d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	191 break;
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	192 /* fgets read something; if it didn't get as
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	193 far as pLastChar, it must have found a newline
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	194 or hit the end of the file; if pLastChar is \n,
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	195 it obviously found a newline; else we haven't
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	196 yet seen a newline, so must continue */
d3696bf08eee Tim Peters fixed PR#75: very long lines cause incorrect tracebacks. Guido van Rossum <guido@python.org> parents: 5608 diff changeset	197 } while (pLastChar != '\0' && pLastChar != '\n');
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	198 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	199 if (i == lineno) {
674 4e2d239dc64c Move printing of filename and lineno to tb_displayline. Guido van Rossum <guido@python.org> parents: 597 diff changeset	200 char *p = linebuf;
2811 07fc4fefb683 ignore control-l (parallelling change to tokenizer.c) Guido van Rossum <guido@python.org> parents: 2062 diff changeset	201 while (p == ' ' \|\| p == '\t' \|\| *p == '\014')
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	202 p++;
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	203 err = PyFile_WriteString(" ", f);
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	204 if (err == 0) {
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	205 err = PyFile_WriteString(p, f);
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	206 if (err == 0 && strchr(p, '\n') == NULL)
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	207 err = PyFile_WriteString("\n", f);
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	208 }
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	209 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	210 fclose(xfp);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	211 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	212 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	213
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	214 static int
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	215 tb_printinternal(PyTracebackObject tb, PyObject f, int limit)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	216 {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	217 int err = 0;
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	218 int depth = 0;
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	219 PyTracebackObject *tb1 = tb;
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	220 while (tb1 != NULL) {
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	221 depth++;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	222 tb1 = tb1->tb_next;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	223 }
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	224 while (tb != NULL && err == 0) {
5046 658815230546 Get the line number from PyCode_Addr2Line instead of believing Guido van Rossum <guido@python.org> parents: 4503 diff changeset	225 if (depth <= limit) {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	226 err = tb_displayline(f,
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	227 PyString_AsString(
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	228 tb->tb_frame->f_code->co_filename),
1831 216b755515e6 add function name to traceback info Guido van Rossum <guido@python.org> parents: 1425 diff changeset	229 tb->tb_lineno,
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	230 PyString_AsString(tb->tb_frame->f_code->co_name));
5046 658815230546 Get the line number from PyCode_Addr2Line instead of believing Guido van Rossum <guido@python.org> parents: 4503 diff changeset	231 }
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	232 depth--;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	233 tb = tb->tb_next;
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	234 if (err == 0)
79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	235 err = PyErr_CheckSignals();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	236 }
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	237 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	238 }
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	239
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	240 int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13256 diff changeset	241 PyTraceBack_Print(PyObject v, PyObject f)
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	242 {
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	243 int err;
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	244 PyObject *limitv;
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	245 int limit = 1000;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	246 if (v == NULL)
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	247 return 0;
20618 57b51966a4f1 Removed two pointless and obfuscating macros. Tim Peters <tim.peters@gmail.com> parents: 14375 diff changeset	248 if (!PyTraceBack_Check(v)) {
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	249 PyErr_BadInternalCall();
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	250 return -1;
a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	251 }
5372 424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	252 limitv = PySys_GetObject("tracebacklimit");
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	253 if (limitv && PyInt_Check(limitv)) {
424922afc1bb Quickly renamed. Guido van Rossum <guido@python.org> parents: 5317 diff changeset	254 limit = PyInt_AsLong(limitv);
1425 72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	255 if (limit <= 0)
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	256 return 0;
72bddfad351a * mpzmodule.c: cast some methods to the proper type. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	257 }
12137 5b5581af951c Change traceback error message to "most recent call last" from Guido van Rossum <guido@python.org> parents: 11999 diff changeset	258 err = PyFile_WriteString("Traceback (most recent call last):\n", f);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	259 if (!err)
31739 49ec0d8f08ec Moved tracebackobject to traceback.h, Closes SF Bug #497067 Nicholas Bastin <nick.bastin@gmail.com> parents: 30968 diff changeset	260 err = tb_printinternal((PyTracebackObject *)v, f, limit);
5608 79e49cbce2ef PyFile_WriteString now returns an error indicator instead of calling Guido van Rossum <guido@python.org> parents: 5405 diff changeset	261 return err;
86 a6934380c6e7 "Compiling" version Guido van Rossum <guido@python.org> parents: diff changeset	262 }

Mercurial > cpython-lru_cache-weakref

annotate Python/traceback.c @ 40582:67287ca4e1e8