Mercurial > cpython-lru_cache-weakref
comparison Lib/idlelib/PyShell.py @ 46222:aed698c8647b
Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62021 | benjamin.peterson | 2008-03-28 18:11:01 -0500 (Fri, 28 Mar 2008) | 2 lines
NIL => NULL
........
r62029 | amaury.forgeotdarc | 2008-03-28 20:42:31 -0500 (Fri, 28 Mar 2008) | 3 lines
Correctly call the base class tearDown();
otherwise running test_logging twice produce the errors we see on all buildbots
........
r62035 | raymond.hettinger | 2008-03-29 05:42:07 -0500 (Sat, 29 Mar 2008) | 1 line
Be explicit about what efficient means.
........
r62036 | georg.brandl | 2008-03-29 06:46:18 -0500 (Sat, 29 Mar 2008) | 2 lines
Fix capitalization.
........
r62037 | amaury.forgeotdarc | 2008-03-29 07:42:54 -0500 (Sat, 29 Mar 2008) | 5 lines
lib2to3 should install a logging handler only when run as a main program,
not when used as a library.
This may please the buildbots, which fail when test_lib2to3 is run before test_logging.
........
r62043 | benjamin.peterson | 2008-03-29 10:24:25 -0500 (Sat, 29 Mar 2008) | 3 lines
#2503 make singletons compared with "is" not == or !=
Thanks to Wummel for the patch
........
r62044 | gerhard.haering | 2008-03-29 14:11:52 -0500 (Sat, 29 Mar 2008) | 2 lines
Documented the lastrowid attribute.
........
r62052 | benjamin.peterson | 2008-03-30 14:35:10 -0500 (Sun, 30 Mar 2008) | 2 lines
Updated README regarding doc formats
........
r62053 | georg.brandl | 2008-03-30 14:41:39 -0500 (Sun, 30 Mar 2008) | 2 lines
The other download formats will be available for 2.6 too.
........
| author | Benjamin Peterson <benjamin@python.org> |
|---|---|
| date | Mon, 31 Mar 2008 01:51:45 +0000 |
| parents | 08468a263a95 |
| children | 031dfe455585 |
comparison
equal
deleted
inserted
replaced
| 46221:ffbe6c790523 | 46222:aed698c8647b |
|---|---|
| 920 response = tkMessageBox.askokcancel( | 920 response = tkMessageBox.askokcancel( |
| 921 "Kill?", | 921 "Kill?", |
| 922 "The program is still running!\n Do you want to kill it?", | 922 "The program is still running!\n Do you want to kill it?", |
| 923 default="ok", | 923 default="ok", |
| 924 parent=self.text) | 924 parent=self.text) |
| 925 if response == False: | 925 if response is False: |
| 926 return "cancel" | 926 return "cancel" |
| 927 if self.reading: | 927 if self.reading: |
| 928 self.top.quit() | 928 self.top.quit() |
| 929 self.canceled = True | 929 self.canceled = True |
| 930 self.closing = True | 930 self.closing = True |
