Mercurial > cpython-lru_cache-weakref

comparison Python/pythonrun.c @ 47072:0c7142c56d7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r63066 | georg.brandl | 2008-05-11 10:56:04 -0400 (Sun, 11 May 2008) | 2 lines #2709 followup: better description of Tk's pros and cons. ........ r63067 | georg.brandl | 2008-05-11 11:05:13 -0400 (Sun, 11 May 2008) | 2 lines #1326: document and test zipimporter.archive and zipimporter.prefix. ........ r63068 | georg.brandl | 2008-05-11 11:07:39 -0400 (Sun, 11 May 2008) | 2 lines #2816: clarify error messages for EOF while scanning strings. ........ r63069 | georg.brandl | 2008-05-11 11:17:41 -0400 (Sun, 11 May 2008) | 3 lines #2787: Flush stdout after writing test name, helpful when running hanging or long-running tests. Patch by Adam Olsen. ........ r63070 | georg.brandl | 2008-05-11 11:20:16 -0400 (Sun, 11 May 2008) | 3 lines #2803: fix wrong invocation of heappush in seldom-reached code. Thanks to Matt Harden. ........ r63073 | benjamin.peterson | 2008-05-11 12:38:07 -0400 (Sun, 11 May 2008) | 2 lines broaden .bzrignore ........ r63076 | andrew.kuchling | 2008-05-11 15:15:52 -0400 (Sun, 11 May 2008) | 1 line Add message to test assertion ........ r63083 | andrew.kuchling | 2008-05-11 16:08:33 -0400 (Sun, 11 May 2008) | 1 line Try setting HOME env.var to fix test on Win32 ........ r63092 | georg.brandl | 2008-05-11 16:53:55 -0400 (Sun, 11 May 2008) | 2 lines #2809 followup: even better split docstring. ........ r63094 | georg.brandl | 2008-05-11 17:03:42 -0400 (Sun, 11 May 2008) | 4 lines - #2250: Exceptions raised during evaluation of names in rlcompleter's ``Completer.complete()`` method are now caught and ignored. ........ r63095 | georg.brandl | 2008-05-11 17:16:37 -0400 (Sun, 11 May 2008) | 2 lines Clarify os.strerror()s exception behavior. ........ r63097 | georg.brandl | 2008-05-11 17:34:10 -0400 (Sun, 11 May 2008) | 2 lines #2535: remove duplicated method. ........ r63104 | alexandre.vassalotti | 2008-05-11 19:04:27 -0400 (Sun, 11 May 2008) | 2 lines Moved the Queue module stub in lib-old. ........
author Alexandre Vassalotti <alexandre@peadrop.com>
date Fri, 16 May 2008 00:41:41 +0000
parents 74b9c85361f8
children 96b34263e448
comparison
equal deleted inserted replaced
47070:6780f01598a2 47072:0c7142c56d7e
1688 break; 1688 break;
1689 case E_TOKEN: 1689 case E_TOKEN:
1690 msg = "invalid token"; 1690 msg = "invalid token";
1691 break; 1691 break;
1692 case E_EOFS: 1692 case E_EOFS:
1693 msg = "EOF while scanning triple-quoted string"; 1693 msg = "EOF while scanning triple-quoted string literal";
1694 break; 1694 break;
1695 case E_EOLS: 1695 case E_EOLS:
1696 msg = "EOL while scanning single-quoted string"; 1696 msg = "EOL while scanning string literal";
1697 break; 1697 break;
1698 case E_INTR: 1698 case E_INTR:
1699 if (!PyErr_Occurred()) 1699 if (!PyErr_Occurred())
1700 PyErr_SetNone(PyExc_KeyboardInterrupt); 1700 PyErr_SetNone(PyExc_KeyboardInterrupt);
1701 return; 1701 return;