diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2009-07-29 20:12:15 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2009-07-29 20:12:15 (GMT) |
| commit | e223eb8477c2d3241641a8a3e266a28d6dcd0c0e (patch) | |
| tree | e4048706d8fe17278dd22ece179ac388ca6bdde5 /Objects | |
| parent | e9ce1fb543a82ea3d6e62a7c8fde07a635dc3283 (diff) | |
| download | cpython-e223eb8477c2d3241641a8a3e266a28d6dcd0c0e.zip cpython-e223eb8477c2d3241641a8a3e266a28d6dcd0c0e.tar.gz cpython-e223eb8477c2d3241641a8a3e266a28d6dcd0c0e.tar.bz2 | |
Merged revisions 74075,74187,74197,74201,74216,74225 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74075 | georg.brandl | 2009-07-18 05:06:31 -0400 (Sat, 18 Jul 2009) | 1 line
#6505: fix typos.
........
r74187 | benjamin.peterson | 2009-07-23 10:19:08 -0400 (Thu, 23 Jul 2009) | 1 line
use bools for autoraise
........
r74197 | benjamin.peterson | 2009-07-24 22:03:48 -0400 (Fri, 24 Jul 2009) | 1 line
clarify
........
r74201 | amaury.forgeotdarc | 2009-07-25 12:22:06 -0400 (Sat, 25 Jul 2009) | 2 lines
Better name a variable: 'buf' seems to imply a mutable buffer.
........
r74216 | michael.foord | 2009-07-26 17:12:14 -0400 (Sun, 26 Jul 2009) | 1 line
Issue 6581. Michael Foord
........
r74225 | kurt.kaiser | 2009-07-27 12:09:28 -0400 (Mon, 27 Jul 2009) | 5 lines
1. Clean workspace more thoughly before build.
2. Add url of branch we are building to 'results' webpage.
(url is now available in $repo_path, could be added to failure email.)
3. Adjust permissions to improve upload reliability.
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/dictobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 907ccf2..03f2010 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -718,7 +718,7 @@ PyDict_GetItem(PyObject *op, PyObject *key) running "python -Wi" for an example related to string interning. Let's just hope that no exception occurs then... This must be _PyThreadState_Current and not PyThreadState_GET() because in debug - mode, it complains if tstate is NULL. */ + mode, the latter complains if tstate is NULL. */ tstate = _PyThreadState_Current; if (tstate != NULL && tstate->curexc_type != NULL) { /* preserve the existing exception */ |