svn+ssh://pythondev@svn.python.org/python/trunk ........ r58221 | georg.brandl | 2007-09-20 10:57:59 -0700 (Thu, 20 Sep 2007) | 2 lines Patch #1181: add os.environ.clear() method. ........ r58225 | sean.reifschneider | 2007-09-20 23:33:28 -0700 (Thu, 20 Sep 2007) | 3 lines Issue1704287: "make install" fails unless you do "make" first. Make oldsharedmods and sharedmods in "libinstall". ........ r58232 | guido.van.rossum | 2007-09-22 13:18:03 -0700 (Sat, 22 Sep 2007) | 4 lines Patch # 188 by Philip Jenvey. Make tell() mark CRLF as a newline. With unit test. ........ r58242 | georg.brandl | 2007-09-24 10:55:47 -0700 (Mon, 24 Sep 2007) | 2 lines Fix typo and double word. ........ r58245 | georg.brandl | 2007-09-24 10:59:28 -0700 (Mon, 24 Sep 2007) | 2 lines #1196: document default radix for int(). ........ r58247 | georg.brandl | 2007-09-24 11:08:24 -0700 (Mon, 24 Sep 2007) | 2 lines #1177: accept 2xx responses for https too, not only http. ........ r58249 | andrew.kuchling | 2007-09-24 16:45:51 -0700 (Mon, 24 Sep 2007) | 1 line Remove stray odd character; grammar fix ........ r58250 | andrew.kuchling | 2007-09-24 16:46:28 -0700 (Mon, 24 Sep 2007) | 1 line Typo fix ........ r58251 | andrew.kuchling | 2007-09-24 17:09:42 -0700 (Mon, 24 Sep 2007) | 1 line Add various items ........ r58268 | vinay.sajip | 2007-09-26 22:34:45 -0700 (Wed, 26 Sep 2007) | 1 line Change to flush and close logic to fix #1760556. ........ r58269 | vinay.sajip | 2007-09-26 22:38:51 -0700 (Wed, 26 Sep 2007) | 1 line Change to basicConfig() to fix #1021. ........ r58270 | georg.brandl | 2007-09-26 23:26:58 -0700 (Wed, 26 Sep 2007) | 2 lines #1208: document match object's boolean value. ........ r58271 | vinay.sajip | 2007-09-26 23:56:13 -0700 (Wed, 26 Sep 2007) | 1 line Minor date change. ........ r58272 | vinay.sajip | 2007-09-27 00:35:10 -0700 (Thu, 27 Sep 2007) | 1 line Change to LogRecord.__init__() to fix #1206. Note that archaic use of type(x) == types.DictType is because of keeping 1.5.2 compatibility. While this is much less relevant these days, there probably needs to be a separate commit for removing all archaic constructs at the same time. ........ r58288 | brett.cannon | 2007-09-30 12:45:10 -0700 (Sun, 30 Sep 2007) | 9 lines tuple.__repr__ did not consider a reference loop as it is not possible from Python code; but it is possible from C. object.__str__ had the issue of not expecting a type to doing something within it's tp_str implementation that could trigger an infinite recursion, but it could in C code.. Both found thanks to BaseException and how it handles its repr. Closes issue #1686386. Thanks to Thomas Herve for taking an initial stab at coming up with a solution. ........ r58289 | brett.cannon | 2007-09-30 13:37:19 -0700 (Sun, 30 Sep 2007) | 3 lines Fix error introduced by r58288; if a tuple is length 0 return its repr and don't worry about any self-referring tuples. ........ r58294 | facundo.batista | 2007-10-02 10:01:24 -0700 (Tue, 02 Oct 2007) | 11 lines Made the various is_* operations return booleans. This was discussed with Cawlishaw by mail, and he basically confirmed that to these is_* operations, there's no need to return Decimal(0) and Decimal(1) if the language supports the False and True booleans. Also added a few tests for the these functions in extra.decTest, since they are mostly untested (apart from the doctests). Thanks Mark Dickinson ........ r58295 | facundo.batista | 2007-10-02 11:21:18 -0700 (Tue, 02 Oct 2007) | 4 lines Added a class to store the digits of log(10), so that they can be made available when necessary without recomputing. Thanks Mark Dickinson ........ r58299 | mark.summerfield | 2007-10-03 01:53:21 -0700 (Wed, 03 Oct 2007) | 4 lines Added note in footnote about string comparisons about unicodedata.normalize(). ........ r58304 | raymond.hettinger | 2007-10-03 14:18:11 -0700 (Wed, 03 Oct 2007) | 1 line enumerate() is no longer bounded to using sequences shorter than LONG_MAX. The possibility of overflow was sending some newsgroup posters into a tizzy. ........ r58305 | raymond.hettinger | 2007-10-03 17:20:27 -0700 (Wed, 03 Oct 2007) | 1 line itertools.count() no longer limited to sys.maxint. ........ r58306 | kurt.kaiser | 2007-10-03 18:49:54 -0700 (Wed, 03 Oct 2007) | 3 lines Assume that the user knows when he wants to end the line; don't insert something he didn't select or complete. ........ r58307 | kurt.kaiser | 2007-10-03 19:07:50 -0700 (Wed, 03 Oct 2007) | 2 lines Remove unused theme that was causing a fault in p3k. ........ r58308 | kurt.kaiser | 2007-10-03 19:09:17 -0700 (Wed, 03 Oct 2007) | 2 lines Clean up EditorWindow close. ........ r58309 | kurt.kaiser | 2007-10-03 19:53:07 -0700 (Wed, 03 Oct 2007) | 7 lines textView cleanup. Patch 1718043 Tal Einat. M idlelib/EditorWindow.py M idlelib/aboutDialog.py M idlelib/textView.py M idlelib/NEWS.txt ........ r58310 | kurt.kaiser | 2007-10-03 20:11:12 -0700 (Wed, 03 Oct 2007) | 3 lines configDialog cleanup. Patch 1730217 Tal Einat. ........ r58311 | neal.norwitz | 2007-10-03 23:00:48 -0700 (Wed, 03 Oct 2007) | 4 lines Coverity #151: Remove deadcode. All this code already exists above starting at line 653. ........ r58325 | fred.drake | 2007-10-04 19:46:12 -0700 (Thu, 04 Oct 2007) | 1 line wrap lines to <80 characters before fixing errors ........ r58326 | raymond.hettinger | 2007-10-04 19:47:07 -0700 (Thu, 04 Oct 2007) | 6 lines Add __asdict__() to NamedTuple and refine the docs. Add maxlen support to deque() and fixup docs. Partially fix __reduce__(). The None as a third arg was no longer supported. Still needs work on __reduce__() to handle recursive inputs. ........ r58327 | fred.drake | 2007-10-04 19:48:32 -0700 (Thu, 04 Oct 2007) | 3 lines move descriptions of ac_(in|out)_buffer_size to the right place http://bugs.python.org/issue1053 ........ r58329 | neal.norwitz | 2007-10-04 20:39:17 -0700 (Thu, 04 Oct 2007) | 3 lines dict could be NULL, so we need to XDECREF. Fix a compiler warning about passing a PyTypeObject* instead of PyObject*. ........ r58330 | neal.norwitz | 2007-10-04 20:41:19 -0700 (Thu, 04 Oct 2007) | 2 lines Fix Coverity #158: Check the correct variable. ........ r58332 | neal.norwitz | 2007-10-04 22:01:38 -0700 (Thu, 04 Oct 2007) | 7 lines Fix Coverity #159. This code was broken if save() returned a negative number since i contained a boolean value and then we compared i < 0 which should never be true. Will backport (assuming it's necessary) ........ r58334 | neal.norwitz | 2007-10-04 22:29:17 -0700 (Thu, 04 Oct 2007) | 1 line Add a note about fixing some more warnings found by Coverity. ........ r58338 | raymond.hettinger | 2007-10-05 12:07:31 -0700 (Fri, 05 Oct 2007) | 1 line Restore BEGIN/END THREADS macros which were squashed in the previous checkin ........ r58343 | gregory.p.smith | 2007-10-06 00:48:10 -0700 (Sat, 06 Oct 2007) | 3 lines Stab in the dark attempt to fix the test_bsddb3 failure on sparc and S-390 ubuntu buildbots. ........ r58344 | gregory.p.smith | 2007-10-06 00:51:59 -0700 (Sat, 06 Oct 2007) | 2 lines Allows BerkeleyDB 4.6.x >= 4.6.21 for the bsddb module. ........ r58348 | gregory.p.smith | 2007-10-06 08:47:37 -0700 (Sat, 06 Oct 2007) | 3 lines Use the host the author likely meant in the first place. pop.gmail.com is reliable. gmail.org is someones personal domain. ........ r58351 | neal.norwitz | 2007-10-06 12:16:28 -0700 (Sat, 06 Oct 2007) | 3 lines Ensure that this test will pass even if another test left an unwritable TESTFN. Also use the safe unlink in test_support instead of rolling our own here. ........ r58368 | georg.brandl | 2007-10-08 00:50:24 -0700 (Mon, 08 Oct 2007) | 3 lines #1123: fix the docs for the str.split(None, sep) case. Also expand a few other methods' docs, which had more info in the deprecated string module docs. ........ r58369 | georg.brandl | 2007-10-08 01:06:05 -0700 (Mon, 08 Oct 2007) | 2 lines Update docstring of sched, also remove an unused assignment. ........ r58370 | raymond.hettinger | 2007-10-08 02:14:28 -0700 (Mon, 08 Oct 2007) | 5 lines Add comments to NamedTuple code. Let the field spec be either a string or a non-string sequence (suggested by Martin Blais with use cases). Improve the error message in the case of a SyntaxError (caused by a duplicate field name). ........ r58371 | raymond.hettinger | 2007-10-08 02:56:29 -0700 (Mon, 08 Oct 2007) | 1 line Missed a line in the docs ........ r58372 | raymond.hettinger | 2007-10-08 03:11:51 -0700 (Mon, 08 Oct 2007) | 1 line Better variable names ........ r58376 | georg.brandl | 2007-10-08 07:12:47 -0700 (Mon, 08 Oct 2007) | 3 lines #1199: docs for tp_as_{number,sequence,mapping}, by Amaury Forgeot d'Arc. No need to merge this to py3k! ........ r58380 | raymond.hettinger | 2007-10-08 14:26:58 -0700 (Mon, 08 Oct 2007) | 1 line Eliminate camelcase function name ........ r58381 | andrew.kuchling | 2007-10-08 16:23:03 -0700 (Mon, 08 Oct 2007) | 1 line Eliminate camelcase function name ........ r58382 | raymond.hettinger | 2007-10-08 18:36:23 -0700 (Mon, 08 Oct 2007) | 1 line Make the error messages more specific ........ r58384 | gregory.p.smith | 2007-10-08 23:02:21 -0700 (Mon, 08 Oct 2007) | 10 lines Splits Modules/_bsddb.c up into bsddb.h and _bsddb.c and adds a C API object available as bsddb.db.api. This is based on the patch submitted by Duncan Grisby here: http://sourceforge.net/tracker/index.php?func=detail&aid=1551895&group_id=13900&atid=313900 See this thread for additional info: http://sourceforge.net/mailarchive/forum.php?thread_name=E1GAVDK-0002rk-Iw%40apasphere.com&forum_name=pybsddb-users It also cleans up the code a little by removing some ifdef/endifs for python prior to 2.1 and for unsupported Berkeley DB <= 3.2. ........ r58385 | gregory.p.smith | 2007-10-08 23:50:43 -0700 (Mon, 08 Oct 2007) | 5 lines Fix a double free when positioning a database cursor to a non-existant string key (and probably a few other situations with string keys). This was reported with a patch as pybsddb sourceforge bug 1708868 by jjjhhhlll at gmail. ........ r58386 | gregory.p.smith | 2007-10-09 00:19:11 -0700 (Tue, 09 Oct 2007) | 3 lines Use the highest cPickle protocol in bsddb.dbshelve. This comes from sourceforge pybsddb patch 1551443 by w_barnes. ........ r58394 | gregory.p.smith | 2007-10-09 11:26:02 -0700 (Tue, 09 Oct 2007) | 2 lines remove another sleepycat reference ........ r58396 | kurt.kaiser | 2007-10-09 12:31:30 -0700 (Tue, 09 Oct 2007) | 3 lines Allow interrupt only when executing user code in subprocess Patch 1225 Tal Einat modified from IDLE-Spoon. ........ r58399 | brett.cannon | 2007-10-09 17:07:50 -0700 (Tue, 09 Oct 2007) | 5 lines Remove file-level typedefs that were inconsistently used throughout the file. Just move over to the public API names. Closes issue1238. ........ r58401 | raymond.hettinger | 2007-10-09 17:26:46 -0700 (Tue, 09 Oct 2007) | 1 line Accept Jim Jewett's api suggestion to use None instead of -1 to indicate unbounded deques. ........ r58403 | kurt.kaiser | 2007-10-09 17:55:40 -0700 (Tue, 09 Oct 2007) | 2 lines Allow cursor color change w/o restart. Patch 1725576 Tal Einat. ........ r58404 | kurt.kaiser | 2007-10-09 18:06:47 -0700 (Tue, 09 Oct 2007) | 2 lines show paste if > 80 columns. Patch 1659326 Tal Einat. ........ r58415 | thomas.heller | 2007-10-11 12:51:32 -0700 (Thu, 11 Oct 2007) | 5 lines On OS X, use os.uname() instead of gestalt.sysv(...) to get the operating system version. This allows to use ctypes when Python was configured with --disable-toolbox-glue. ........ r58419 | neal.norwitz | 2007-10-11 20:01:01 -0700 (Thu, 11 Oct 2007) | 1 line Get rid of warning about not being able to create an existing directory. ........ r58420 | neal.norwitz | 2007-10-11 20:01:30 -0700 (Thu, 11 Oct 2007) | 1 line Get rid of warnings on a bunch of platforms by using a proper prototype. ........ r58421 | neal.norwitz | 2007-10-11 20:01:54 -0700 (Thu, 11 Oct 2007) | 4 lines Get rid of compiler warning about retval being used (returned) without being initialized. (gcc warning and Coverity 202) ........ r58422 | neal.norwitz | 2007-10-11 20:03:23 -0700 (Thu, 11 Oct 2007) | 1 line Fix Coverity 168: Close the file before returning (exiting). ........ r58423 | neal.norwitz | 2007-10-11 20:04:18 -0700 (Thu, 11 Oct 2007) | 4 lines Fix Coverity 180: Don't overallocate. We don't need structs, but pointers. Also fix a memory leak. ........ r58424 | neal.norwitz | 2007-10-11 20:05:19 -0700 (Thu, 11 Oct 2007) | 5 lines Fix Coverity 185-186: If the passed in FILE is NULL, uninitialized memory would be accessed. Will backport. ........ r58425 | neal.norwitz | 2007-10-11 20:52:34 -0700 (Thu, 11 Oct 2007) | 1 line Get this module to compile with bsddb versions prior to 4.3 ........ r58430 | martin.v.loewis | 2007-10-12 01:56:52 -0700 (Fri, 12 Oct 2007) | 3 lines Bug #1216: Restore support for Visual Studio 2002. Will backport to 2.5. ........ r58433 | raymond.hettinger | 2007-10-12 10:53:11 -0700 (Fri, 12 Oct 2007) | 1 line Fix test of count.__repr__() to ignore the 'L' if the count is a long ........ r58434 | gregory.p.smith | 2007-10-12 11:44:06 -0700 (Fri, 12 Oct 2007) | 4 lines Fixes http://bugs.python.org/issue1233 - bsddb.dbshelve.DBShelf.append was useless due to inverted logic. Also adds a test case for RECNO dbs to test_dbshelve. ........ r58445 | georg.brandl | 2007-10-13 06:20:03 -0700 (Sat, 13 Oct 2007) | 2 lines Fix email example. ........ r58450 | gregory.p.smith | 2007-10-13 16:02:05 -0700 (Sat, 13 Oct 2007) | 2 lines Fix an uncollectable reference leak in bsddb.db.DBShelf.append ........ r58453 | neal.norwitz | 2007-10-13 17:18:40 -0700 (Sat, 13 Oct 2007) | 8 lines Let the O/S supply a port if none of the default ports can be used. This should make the tests more robust at the expense of allowing tests to be sloppier by not requiring them to cleanup after themselves. (It will legitamitely help when running two test suites simultaneously or if another process is already using one of the predefined ports.) Also simplifies (slightLy) the exception handling elsewhere. ........ r58459 | neal.norwitz | 2007-10-14 11:30:21 -0700 (Sun, 14 Oct 2007) | 2 lines Don't raise a string exception, they don't work anymore. ........ r58460 | neal.norwitz | 2007-10-14 11:40:37 -0700 (Sun, 14 Oct 2007) | 1 line Use unittest for assertions ........ r58468 | armin.rigo | 2007-10-15 00:48:35 -0700 (Mon, 15 Oct 2007) | 2 lines test_bigbits was not testing what it seemed to. ........ r58471 | guido.van.rossum | 2007-10-15 08:54:11 -0700 (Mon, 15 Oct 2007) | 3 lines Change a PyErr_Print() into a PyErr_Clear(), per discussion in issue 1031213. ........ r58500 | raymond.hettinger | 2007-10-16 12:18:30 -0700 (Tue, 16 Oct 2007) | 1 line Improve error messages ........ r58506 | raymond.hettinger | 2007-10-16 14:28:32 -0700 (Tue, 16 Oct 2007) | 1 line More docs, error messages, and tests ........ r58507 | andrew.kuchling | 2007-10-16 15:58:03 -0700 (Tue, 16 Oct 2007) | 1 line Add items ........ r58508 | brett.cannon | 2007-10-16 16:24:06 -0700 (Tue, 16 Oct 2007) | 3 lines Remove ``:const:`` notation on None in parameter list. Since the markup is not rendered for parameters it just showed up as ``:const:`None` `` in the output. ........ r58509 | brett.cannon | 2007-10-16 16:26:45 -0700 (Tue, 16 Oct 2007) | 3 lines Re-order some functions whose parameters differ between PyObject and const char * so that they are next to each other. ........ r58522 | armin.rigo | 2007-10-17 11:46:37 -0700 (Wed, 17 Oct 2007) | 5 lines Fix the overflow checking of list_repeat. Introduce overflow checking into list_inplace_repeat. Backport candidate, possibly. ........ r58530 | facundo.batista | 2007-10-17 20:16:03 -0700 (Wed, 17 Oct 2007) | 7 lines Issue #1580738. When HTTPConnection reads the whole stream with read(), it closes itself. When the stream is read in several calls to read(n), it should behave in the same way if HTTPConnection knows where the end of the stream is (through self.length). Added a test case for this behaviour. ........ r58531 | facundo.batista | 2007-10-17 20:44:48 -0700 (Wed, 17 Oct 2007) | 3 lines Issue 1289, just a typo. ........ r58532 | gregory.p.smith | 2007-10-18 00:56:54 -0700 (Thu, 18 Oct 2007) | 4 lines cleanup test_dbtables to use mkdtemp. cleanup dbtables to pass txn as a keyword argument whenever possible to avoid bugs and confusion. (dbtables.py line 447 self.db.get using txn as a non-keyword was an actual bug due to this) ........ r58533 | gregory.p.smith | 2007-10-18 01:34:20 -0700 (Thu, 18 Oct 2007) | 4 lines Fix a weird bug in dbtables: if it chose a random rowid string that contained NULL bytes it would cause the database all sorts of problems in the future leading to very strange random failures and corrupt dbtables.bsdTableDb dbs. ........ r58534 | gregory.p.smith | 2007-10-18 09:32:02 -0700 (Thu, 18 Oct 2007) | 3 lines A cleaner fix than the one committed last night. Generate random rowids that do not contain null bytes. ........ r58537 | gregory.p.smith | 2007-10-18 10:17:57 -0700 (Thu, 18 Oct 2007) | 2 lines mention bsddb fixes. ........ r58538 | raymond.hettinger | 2007-10-18 14:13:06 -0700 (Thu, 18 Oct 2007) | 1 line Remove useless warning ........ r58539 | gregory.p.smith | 2007-10-19 00:31:20 -0700 (Fri, 19 Oct 2007) | 2 lines squelch the warning that this test is supposed to trigger. ........ r58542 | georg.brandl | 2007-10-19 05:32:39 -0700 (Fri, 19 Oct 2007) | 2 lines Clarify wording for apply(). ........ r58544 | mark.summerfield | 2007-10-19 05:48:17 -0700 (Fri, 19 Oct 2007) | 3 lines Added a cross-ref to each other. ........ r58545 | georg.brandl | 2007-10-19 10:38:49 -0700 (Fri, 19 Oct 2007) | 2 lines #1284: "S" means "seen", not unread. ........ r58548 | thomas.heller | 2007-10-19 11:11:41 -0700 (Fri, 19 Oct 2007) | 4 lines Fix ctypes on 32-bit systems when Python is configured --with-system-ffi. See also https://bugs.launchpad.net/bugs/72505. Ported from release25-maint branch. ........ r58550 | facundo.batista | 2007-10-19 12:25:57 -0700 (Fri, 19 Oct 2007) | 8 lines The constructor from tuple was way too permissive: it allowed bad coefficient numbers, floats in the sign, and other details that generated directly the wrong number in the best case, or triggered misfunctionality in the alorithms. Test cases added for these issues. Thanks Mark Dickinson. ........ r58559 | georg.brandl | 2007-10-20 06:22:53 -0700 (Sat, 20 Oct 2007) | 2 lines Fix code being interpreted as a target. ........ r58561 | georg.brandl | 2007-10-20 06:36:24 -0700 (Sat, 20 Oct 2007) | 2 lines Document new "cmdoption" directive. ........ r58562 | georg.brandl | 2007-10-20 08:21:22 -0700 (Sat, 20 Oct 2007) | 2 lines Make a path more Unix-standardy. ........ r58564 | georg.brandl | 2007-10-20 10:51:39 -0700 (Sat, 20 Oct 2007) | 2 lines Document new directive "envvar". ........ r58567 | georg.brandl | 2007-10-20 11:08:14 -0700 (Sat, 20 Oct 2007) | 6 lines * Add new toplevel chapter, "Using Python." (how to install, configure and setup python on different platforms -- at least in theory.) * Move the Python on Mac docs in that chapter. * Add a new chapter about the command line invocation, by stargaming. ........ r58568 | georg.brandl | 2007-10-20 11:33:20 -0700 (Sat, 20 Oct 2007) | 2 lines Change title, for now. ........ r58569 | georg.brandl | 2007-10-20 11:39:25 -0700 (Sat, 20 Oct 2007) | 2 lines Add entry to ACKS. ........ r58570 | georg.brandl | 2007-10-20 12:05:45 -0700 (Sat, 20 Oct 2007) | 2 lines Clarify -E docs. ........ r58571 | georg.brandl | 2007-10-20 12:08:36 -0700 (Sat, 20 Oct 2007) | 2 lines Even more clarification. ........ r58572 | andrew.kuchling | 2007-10-20 12:25:37 -0700 (Sat, 20 Oct 2007) | 1 line Fix protocol name ........ r58573 | andrew.kuchling | 2007-10-20 12:35:18 -0700 (Sat, 20 Oct 2007) | 1 line Various items ........ r58574 | andrew.kuchling | 2007-10-20 12:39:35 -0700 (Sat, 20 Oct 2007) | 1 line Use correct header line ........ r58576 | armin.rigo | 2007-10-21 02:14:15 -0700 (Sun, 21 Oct 2007) | 3 lines Add a crasher for the long-standing issue with closing a file while another thread uses it. ........ r58577 | georg.brandl | 2007-10-21 03:01:56 -0700 (Sun, 21 Oct 2007) | 2 lines Remove duplicate crasher. ........ r58578 | georg.brandl | 2007-10-21 03:24:20 -0700 (Sun, 21 Oct 2007) | 2 lines Unify "byte code" to "bytecode". Also sprinkle :term: markup for it. ........ r58579 | georg.brandl | 2007-10-21 03:32:54 -0700 (Sun, 21 Oct 2007) | 2 lines Add markup to new function descriptions. ........ r58580 | georg.brandl | 2007-10-21 03:45:46 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term:s for descriptors. ........ r58581 | georg.brandl | 2007-10-21 03:46:24 -0700 (Sun, 21 Oct 2007) | 2 lines Unify "file-descriptor" to "file descriptor". ........ r58582 | georg.brandl | 2007-10-21 03:52:38 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term: for generators. ........ r58583 | georg.brandl | 2007-10-21 05:10:28 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term:s for iterator. ........ r58584 | georg.brandl | 2007-10-21 05:15:05 -0700 (Sun, 21 Oct 2007) | 2 lines Add :term:s for "new-style class". ........ r58588 | neal.norwitz | 2007-10-21 21:47:54 -0700 (Sun, 21 Oct 2007) | 1 line Add Chris Monson so he can edit PEPs. ........ r58594 | guido.van.rossum | 2007-10-22 09:27:19 -0700 (Mon, 22 Oct 2007) | 4 lines Issue #1307, patch by Derek Shockey. When "MAIL" is received without args, an exception happens instead of sending a 501 syntax error response. ........ r58598 | travis.oliphant | 2007-10-22 19:40:56 -0700 (Mon, 22 Oct 2007) | 1 line Add phuang patch from Issue 708374 which adds offset parameter to mmap module. ........ r58601 | neal.norwitz | 2007-10-22 22:44:27 -0700 (Mon, 22 Oct 2007) | 2 lines Bug #1313, fix typo (wrong variable name) in example. ........ r58609 | georg.brandl | 2007-10-23 11:21:35 -0700 (Tue, 23 Oct 2007) | 2 lines Update Pygments version from externals. ........ r58618 | guido.van.rossum | 2007-10-23 12:25:41 -0700 (Tue, 23 Oct 2007) | 3 lines Issue 1307 by Derek Shockey, fox the same bug for RCPT. Neal: please backport! ........ r58620 | raymond.hettinger | 2007-10-23 13:37:41 -0700 (Tue, 23 Oct 2007) | 1 line Shorter name for namedtuple() ........ r58621 | andrew.kuchling | 2007-10-23 13:55:47 -0700 (Tue, 23 Oct 2007) | 1 line Update name ........ r58622 | raymond.hettinger | 2007-10-23 14:23:07 -0700 (Tue, 23 Oct 2007) | 1 line Fixup news entry ........ r58623 | raymond.hettinger | 2007-10-23 18:28:33 -0700 (Tue, 23 Oct 2007) | 1 line Optimize sum() for integer and float inputs. ........ r58624 | raymond.hettinger | 2007-10-23 19:05:51 -0700 (Tue, 23 Oct 2007) | 1 line Fixup error return and add support for intermixed ints and floats/ ........ r58628 | vinay.sajip | 2007-10-24 03:47:06 -0700 (Wed, 24 Oct 2007) | 1 line Bug #1321: Fixed logic error in TimedRotatingFileHandler.__init__() ........ r58641 | facundo.batista | 2007-10-24 12:11:08 -0700 (Wed, 24 Oct 2007) | 4 lines Issue 1290. CharacterData.__repr__ was constructing a string in response that keeped having a non-ascii character. ........ r58643 | thomas.heller | 2007-10-24 12:50:45 -0700 (Wed, 24 Oct 2007) | 1 line Added unittest for calling a function with paramflags (backport from py3k branch). ........ r58645 | matthias.klose | 2007-10-24 13:00:44 -0700 (Wed, 24 Oct 2007) | 2 lines - Build using system ffi library on arm*-linux*. ........ r58651 | georg.brandl | 2007-10-24 14:40:38 -0700 (Wed, 24 Oct 2007) | 2 lines Bug #1287: make os.environ.pop() work as expected. ........ r58652 | raymond.hettinger | 2007-10-24 19:26:58 -0700 (Wed, 24 Oct 2007) | 1 line Missing DECREFs ........ r58653 | matthias.klose | 2007-10-24 23:37:24 -0700 (Wed, 24 Oct 2007) | 2 lines - Build using system ffi library on arm*-linux*, pass --with-system-ffi to CONFIG_ARGS ........ r58655 | thomas.heller | 2007-10-25 12:47:32 -0700 (Thu, 25 Oct 2007) | 2 lines ffi_type_longdouble may be already #defined. See issue 1324. ........ r58656 | kurt.kaiser | 2007-10-25 15:43:45 -0700 (Thu, 25 Oct 2007) | 3 lines Correct an ancient bug in an unused path by removing that path: register() is now idempotent. ........ r58660 | kurt.kaiser | 2007-10-25 17:10:09 -0700 (Thu, 25 Oct 2007) | 4 lines 1. Add comments to provide top-level documentation. 2. Refactor to use more descriptive names. 3. Enhance tests in main(). ........ r58675 | georg.brandl | 2007-10-26 11:30:41 -0700 (Fri, 26 Oct 2007) | 2 lines Fix new pop() method on os.environ on ignorecase-platforms. ........ r58696 | neal.norwitz | 2007-10-27 15:32:21 -0700 (Sat, 27 Oct 2007) | 1 line Update URL for Pygments. 0.8.1 is no longer available ........ r58697 | hyeshik.chang | 2007-10-28 04:19:02 -0700 (Sun, 28 Oct 2007) | 3 lines - Add support for FreeBSD 8 which is recently forked from FreeBSD 7. - Regenerate IN module for most recent maintenance tree of FreeBSD 6 and 7. ........ r58698 | hyeshik.chang | 2007-10-28 05:38:09 -0700 (Sun, 28 Oct 2007) | 2 lines Enable platform-specific tweaks for FreeBSD 8 (exactly same to FreeBSD 7's yet) ........ r58700 | kurt.kaiser | 2007-10-28 12:03:59 -0700 (Sun, 28 Oct 2007) | 2 lines Add confirmation dialog before printing. Patch 1717170 Tal Einat. ........ r58706 | guido.van.rossum | 2007-10-29 13:52:45 -0700 (Mon, 29 Oct 2007) | 3 lines Patch 1353 by Jacob Winther. Add mp4 mapping to mimetypes.py. ........ r58709 | guido.van.rossum | 2007-10-29 15:15:05 -0700 (Mon, 29 Oct 2007) | 6 lines Backport fixes for the code that decodes octal escapes (and for PyString also hex escapes) -- this was reaching beyond the end of the input string buffer, even though it is not supposed to be \0-terminated. This has no visible effect but is clearly the correct thing to do. (In 3.0 it had a visible effect after removing ob_sstate from PyString.) ........ r58710 | kurt.kaiser | 2007-10-29 19:38:54 -0700 (Mon, 29 Oct 2007) | 7 lines check in Tal Einat's update to tabpage.py Patch 1612746 M configDialog.py M NEWS.txt AM tabbedpages.py ........ r58715 | georg.brandl | 2007-10-30 10:51:18 -0700 (Tue, 30 Oct 2007) | 2 lines Use correct markup. ........ r58716 | georg.brandl | 2007-10-30 10:57:12 -0700 (Tue, 30 Oct 2007) | 2 lines Make example about hiding None return values at the prompt clearer. ........ r58728 | neal.norwitz | 2007-10-30 23:33:20 -0700 (Tue, 30 Oct 2007) | 1 line Fix some compiler warnings for signed comparisons on Unix and Windows. ........ r58731 | martin.v.loewis | 2007-10-31 10:19:33 -0700 (Wed, 31 Oct 2007) | 2 lines Adding Christian Heimes. ........ r58737 | raymond.hettinger | 2007-10-31 14:57:58 -0700 (Wed, 31 Oct 2007) | 1 line Clarify the reasons why pickle is almost always better than marshal ........ r58739 | raymond.hettinger | 2007-10-31 15:15:49 -0700 (Wed, 31 Oct 2007) | 1 line Sets are marshalable. ........
1420 lines
50 KiB
Python
1420 lines
50 KiB
Python
#! /usr/bin/env python
|
|
|
|
import os
|
|
import os.path
|
|
import sys
|
|
import getopt
|
|
import re
|
|
import socket
|
|
import time
|
|
import threading
|
|
import traceback
|
|
import types
|
|
|
|
import linecache
|
|
from code import InteractiveInterpreter
|
|
|
|
try:
|
|
from Tkinter import *
|
|
except ImportError:
|
|
print("** IDLE can't import Tkinter. " \
|
|
"Your Python may not be configured for Tk. **", file=sys.__stderr__)
|
|
sys.exit(1)
|
|
import tkMessageBox
|
|
|
|
from idlelib.EditorWindow import EditorWindow, fixwordbreaks
|
|
from idlelib.FileList import FileList
|
|
from idlelib.ColorDelegator import ColorDelegator
|
|
from idlelib.UndoDelegator import UndoDelegator
|
|
from idlelib.OutputWindow import OutputWindow
|
|
from idlelib.configHandler import idleConf
|
|
from idlelib import idlever
|
|
from idlelib import rpc
|
|
from idlelib import Debugger
|
|
from idlelib import RemoteDebugger
|
|
from idlelib import macosxSupport
|
|
|
|
LOCALHOST = '127.0.0.1'
|
|
|
|
try:
|
|
from signal import SIGTERM
|
|
except ImportError:
|
|
SIGTERM = 15
|
|
|
|
# Override warnings module to write to warning_stream. Initialize to send IDLE
|
|
# internal warnings to the console. ScriptBinding.check_syntax() will
|
|
# temporarily redirect the stream to the shell window to display warnings when
|
|
# checking user's code.
|
|
global warning_stream
|
|
warning_stream = sys.__stderr__
|
|
try:
|
|
import warnings
|
|
except ImportError:
|
|
pass
|
|
else:
|
|
def idle_showwarning(message, category, filename, lineno):
|
|
file = warning_stream
|
|
try:
|
|
file.write(warnings.formatwarning(message, category, filename, lineno))
|
|
except IOError:
|
|
pass ## file (probably __stderr__) is invalid, warning dropped.
|
|
warnings.showwarning = idle_showwarning
|
|
def idle_formatwarning(message, category, filename, lineno):
|
|
"""Format warnings the IDLE way"""
|
|
s = "\nWarning (from warnings module):\n"
|
|
s += ' File \"%s\", line %s\n' % (filename, lineno)
|
|
line = linecache.getline(filename, lineno).strip()
|
|
if line:
|
|
s += " %s\n" % line
|
|
s += "%s: %s\n>>> " % (category.__name__, message)
|
|
return s
|
|
warnings.formatwarning = idle_formatwarning
|
|
|
|
def extended_linecache_checkcache(filename=None,
|
|
orig_checkcache=linecache.checkcache):
|
|
"""Extend linecache.checkcache to preserve the <pyshell#...> entries
|
|
|
|
Rather than repeating the linecache code, patch it to save the
|
|
<pyshell#...> entries, call the original linecache.checkcache()
|
|
(which destroys them), and then restore the saved entries.
|
|
|
|
orig_checkcache is bound at definition time to the original
|
|
method, allowing it to be patched.
|
|
|
|
"""
|
|
cache = linecache.cache
|
|
save = {}
|
|
for filename in cache:
|
|
if filename[:1] + filename[-1:] == '<>':
|
|
save[filename] = cache[filename]
|
|
orig_checkcache()
|
|
cache.update(save)
|
|
|
|
# Patch linecache.checkcache():
|
|
linecache.checkcache = extended_linecache_checkcache
|
|
|
|
|
|
class PyShellEditorWindow(EditorWindow):
|
|
"Regular text edit window in IDLE, supports breakpoints"
|
|
|
|
def __init__(self, *args):
|
|
self.breakpoints = []
|
|
EditorWindow.__init__(self, *args)
|
|
self.text.bind("<<set-breakpoint-here>>", self.set_breakpoint_here)
|
|
self.text.bind("<<clear-breakpoint-here>>", self.clear_breakpoint_here)
|
|
self.text.bind("<<open-python-shell>>", self.flist.open_shell)
|
|
|
|
self.breakpointPath = os.path.join(idleConf.GetUserCfgDir(),
|
|
'breakpoints.lst')
|
|
# whenever a file is changed, restore breakpoints
|
|
if self.io.filename: self.restore_file_breaks()
|
|
def filename_changed_hook(old_hook=self.io.filename_change_hook,
|
|
self=self):
|
|
self.restore_file_breaks()
|
|
old_hook()
|
|
self.io.set_filename_change_hook(filename_changed_hook)
|
|
|
|
rmenu_specs = [("Set Breakpoint", "<<set-breakpoint-here>>"),
|
|
("Clear Breakpoint", "<<clear-breakpoint-here>>")]
|
|
|
|
def set_breakpoint(self, lineno):
|
|
text = self.text
|
|
filename = self.io.filename
|
|
text.tag_add("BREAK", "%d.0" % lineno, "%d.0" % (lineno+1))
|
|
try:
|
|
i = self.breakpoints.index(lineno)
|
|
except ValueError: # only add if missing, i.e. do once
|
|
self.breakpoints.append(lineno)
|
|
try: # update the subprocess debugger
|
|
debug = self.flist.pyshell.interp.debugger
|
|
debug.set_breakpoint_here(filename, lineno)
|
|
except: # but debugger may not be active right now....
|
|
pass
|
|
|
|
def set_breakpoint_here(self, event=None):
|
|
text = self.text
|
|
filename = self.io.filename
|
|
if not filename:
|
|
text.bell()
|
|
return
|
|
lineno = int(float(text.index("insert")))
|
|
self.set_breakpoint(lineno)
|
|
|
|
def clear_breakpoint_here(self, event=None):
|
|
text = self.text
|
|
filename = self.io.filename
|
|
if not filename:
|
|
text.bell()
|
|
return
|
|
lineno = int(float(text.index("insert")))
|
|
try:
|
|
self.breakpoints.remove(lineno)
|
|
except:
|
|
pass
|
|
text.tag_remove("BREAK", "insert linestart",\
|
|
"insert lineend +1char")
|
|
try:
|
|
debug = self.flist.pyshell.interp.debugger
|
|
debug.clear_breakpoint_here(filename, lineno)
|
|
except:
|
|
pass
|
|
|
|
def clear_file_breaks(self):
|
|
if self.breakpoints:
|
|
text = self.text
|
|
filename = self.io.filename
|
|
if not filename:
|
|
text.bell()
|
|
return
|
|
self.breakpoints = []
|
|
text.tag_remove("BREAK", "1.0", END)
|
|
try:
|
|
debug = self.flist.pyshell.interp.debugger
|
|
debug.clear_file_breaks(filename)
|
|
except:
|
|
pass
|
|
|
|
def store_file_breaks(self):
|
|
"Save breakpoints when file is saved"
|
|
# XXX 13 Dec 2002 KBK Currently the file must be saved before it can
|
|
# be run. The breaks are saved at that time. If we introduce
|
|
# a temporary file save feature the save breaks functionality
|
|
# needs to be re-verified, since the breaks at the time the
|
|
# temp file is created may differ from the breaks at the last
|
|
# permanent save of the file. Currently, a break introduced
|
|
# after a save will be effective, but not persistent.
|
|
# This is necessary to keep the saved breaks synched with the
|
|
# saved file.
|
|
#
|
|
# Breakpoints are set as tagged ranges in the text. Certain
|
|
# kinds of edits cause these ranges to be deleted: Inserting
|
|
# or deleting a line just before a breakpoint, and certain
|
|
# deletions prior to a breakpoint. These issues need to be
|
|
# investigated and understood. It's not clear if they are
|
|
# Tk issues or IDLE issues, or whether they can actually
|
|
# be fixed. Since a modified file has to be saved before it is
|
|
# run, and since self.breakpoints (from which the subprocess
|
|
# debugger is loaded) is updated during the save, the visible
|
|
# breaks stay synched with the subprocess even if one of these
|
|
# unexpected breakpoint deletions occurs.
|
|
breaks = self.breakpoints
|
|
filename = self.io.filename
|
|
try:
|
|
lines = open(self.breakpointPath,"r").readlines()
|
|
except IOError:
|
|
lines = []
|
|
new_file = open(self.breakpointPath,"w")
|
|
for line in lines:
|
|
if not line.startswith(filename + '='):
|
|
new_file.write(line)
|
|
self.update_breakpoints()
|
|
breaks = self.breakpoints
|
|
if breaks:
|
|
new_file.write(filename + '=' + str(breaks) + '\n')
|
|
new_file.close()
|
|
|
|
def restore_file_breaks(self):
|
|
self.text.update() # this enables setting "BREAK" tags to be visible
|
|
filename = self.io.filename
|
|
if filename is None:
|
|
return
|
|
if os.path.isfile(self.breakpointPath):
|
|
lines = open(self.breakpointPath,"r").readlines()
|
|
for line in lines:
|
|
if line.startswith(filename + '='):
|
|
breakpoint_linenumbers = eval(line[len(filename)+1:])
|
|
for breakpoint_linenumber in breakpoint_linenumbers:
|
|
self.set_breakpoint(breakpoint_linenumber)
|
|
|
|
def update_breakpoints(self):
|
|
"Retrieves all the breakpoints in the current window"
|
|
text = self.text
|
|
ranges = text.tag_ranges("BREAK")
|
|
linenumber_list = self.ranges_to_linenumbers(ranges)
|
|
self.breakpoints = linenumber_list
|
|
|
|
def ranges_to_linenumbers(self, ranges):
|
|
lines = []
|
|
for index in range(0, len(ranges), 2):
|
|
lineno = int(float(ranges[index]))
|
|
end = int(float(ranges[index+1]))
|
|
while lineno < end:
|
|
lines.append(lineno)
|
|
lineno += 1
|
|
return lines
|
|
|
|
# XXX 13 Dec 2002 KBK Not used currently
|
|
# def saved_change_hook(self):
|
|
# "Extend base method - clear breaks if module is modified"
|
|
# if not self.get_saved():
|
|
# self.clear_file_breaks()
|
|
# EditorWindow.saved_change_hook(self)
|
|
|
|
def _close(self):
|
|
"Extend base method - clear breaks when module is closed"
|
|
self.clear_file_breaks()
|
|
EditorWindow._close(self)
|
|
|
|
|
|
class PyShellFileList(FileList):
|
|
"Extend base class: IDLE supports a shell and breakpoints"
|
|
|
|
# override FileList's class variable, instances return PyShellEditorWindow
|
|
# instead of EditorWindow when new edit windows are created.
|
|
EditorWindow = PyShellEditorWindow
|
|
|
|
pyshell = None
|
|
|
|
def open_shell(self, event=None):
|
|
if self.pyshell:
|
|
self.pyshell.top.wakeup()
|
|
else:
|
|
self.pyshell = PyShell(self)
|
|
if self.pyshell:
|
|
if not self.pyshell.begin():
|
|
return None
|
|
return self.pyshell
|
|
|
|
|
|
class ModifiedColorDelegator(ColorDelegator):
|
|
"Extend base class: colorizer for the shell window itself"
|
|
|
|
def __init__(self):
|
|
ColorDelegator.__init__(self)
|
|
self.LoadTagDefs()
|
|
|
|
def recolorize_main(self):
|
|
self.tag_remove("TODO", "1.0", "iomark")
|
|
self.tag_add("SYNC", "1.0", "iomark")
|
|
ColorDelegator.recolorize_main(self)
|
|
|
|
def LoadTagDefs(self):
|
|
ColorDelegator.LoadTagDefs(self)
|
|
theme = idleConf.GetOption('main','Theme','name')
|
|
self.tagdefs.update({
|
|
"stdin": {'background':None,'foreground':None},
|
|
"stdout": idleConf.GetHighlight(theme, "stdout"),
|
|
"stderr": idleConf.GetHighlight(theme, "stderr"),
|
|
"console": idleConf.GetHighlight(theme, "console"),
|
|
})
|
|
|
|
class ModifiedUndoDelegator(UndoDelegator):
|
|
"Extend base class: forbid insert/delete before the I/O mark"
|
|
|
|
def insert(self, index, chars, tags=None):
|
|
try:
|
|
if self.delegate.compare(index, "<", "iomark"):
|
|
self.delegate.bell()
|
|
return
|
|
except TclError:
|
|
pass
|
|
UndoDelegator.insert(self, index, chars, tags)
|
|
|
|
def delete(self, index1, index2=None):
|
|
try:
|
|
if self.delegate.compare(index1, "<", "iomark"):
|
|
self.delegate.bell()
|
|
return
|
|
except TclError:
|
|
pass
|
|
UndoDelegator.delete(self, index1, index2)
|
|
|
|
|
|
class MyRPCClient(rpc.RPCClient):
|
|
|
|
def handle_EOF(self):
|
|
"Override the base class - just re-raise EOFError"
|
|
raise EOFError
|
|
|
|
|
|
class ModifiedInterpreter(InteractiveInterpreter):
|
|
|
|
def __init__(self, tkconsole):
|
|
self.tkconsole = tkconsole
|
|
locals = sys.modules['__main__'].__dict__
|
|
InteractiveInterpreter.__init__(self, locals=locals)
|
|
self.save_warnings_filters = None
|
|
self.restarting = False
|
|
self.subprocess_arglist = self.build_subprocess_arglist()
|
|
|
|
port = 8833
|
|
rpcclt = None
|
|
rpcpid = None
|
|
|
|
def spawn_subprocess(self):
|
|
args = self.subprocess_arglist
|
|
self.rpcpid = os.spawnv(os.P_NOWAIT, sys.executable, args)
|
|
|
|
def build_subprocess_arglist(self):
|
|
w = ['-W' + s for s in sys.warnoptions]
|
|
# Maybe IDLE is installed and is being accessed via sys.path,
|
|
# or maybe it's not installed and the idle.py script is being
|
|
# run from the IDLE source directory.
|
|
del_exitf = idleConf.GetOption('main', 'General', 'delete-exitfunc',
|
|
default=False, type='bool')
|
|
if __name__ == 'idlelib.PyShell':
|
|
command = "__import__('idlelib.run').run.main(%r)" % (del_exitf,)
|
|
else:
|
|
command = "__import__('run').main(%r)" % (del_exitf,)
|
|
if sys.platform[:3] == 'win' and ' ' in sys.executable:
|
|
# handle embedded space in path by quoting the argument
|
|
decorated_exec = '"%s"' % sys.executable
|
|
else:
|
|
decorated_exec = sys.executable
|
|
return [decorated_exec] + w + ["-c", command, str(self.port)]
|
|
|
|
def start_subprocess(self):
|
|
# spawning first avoids passing a listening socket to the subprocess
|
|
self.spawn_subprocess()
|
|
#time.sleep(20) # test to simulate GUI not accepting connection
|
|
addr = (LOCALHOST, self.port)
|
|
# Idle starts listening for connection on localhost
|
|
for i in range(3):
|
|
time.sleep(i)
|
|
try:
|
|
self.rpcclt = MyRPCClient(addr)
|
|
break
|
|
except socket.error as err:
|
|
pass
|
|
else:
|
|
self.display_port_binding_error()
|
|
return None
|
|
# Accept the connection from the Python execution server
|
|
self.rpcclt.listening_sock.settimeout(10)
|
|
try:
|
|
self.rpcclt.accept()
|
|
except socket.timeout as err:
|
|
self.display_no_subprocess_error()
|
|
return None
|
|
self.rpcclt.register("stdin", self.tkconsole)
|
|
self.rpcclt.register("stdout", self.tkconsole.stdout)
|
|
self.rpcclt.register("stderr", self.tkconsole.stderr)
|
|
self.rpcclt.register("flist", self.tkconsole.flist)
|
|
self.rpcclt.register("linecache", linecache)
|
|
self.rpcclt.register("interp", self)
|
|
self.transfer_path()
|
|
self.poll_subprocess()
|
|
return self.rpcclt
|
|
|
|
def restart_subprocess(self):
|
|
if self.restarting:
|
|
return self.rpcclt
|
|
self.restarting = True
|
|
# close only the subprocess debugger
|
|
debug = self.getdebugger()
|
|
if debug:
|
|
try:
|
|
# Only close subprocess debugger, don't unregister gui_adap!
|
|
RemoteDebugger.close_subprocess_debugger(self.rpcclt)
|
|
except:
|
|
pass
|
|
# Kill subprocess, spawn a new one, accept connection.
|
|
self.rpcclt.close()
|
|
self.unix_terminate()
|
|
console = self.tkconsole
|
|
was_executing = console.executing
|
|
console.executing = False
|
|
self.spawn_subprocess()
|
|
try:
|
|
self.rpcclt.accept()
|
|
except socket.timeout as err:
|
|
self.display_no_subprocess_error()
|
|
return None
|
|
self.transfer_path()
|
|
# annotate restart in shell window and mark it
|
|
console.text.delete("iomark", "end-1c")
|
|
if was_executing:
|
|
console.write('\n')
|
|
console.showprompt()
|
|
halfbar = ((int(console.width) - 16) // 2) * '='
|
|
console.write(halfbar + ' RESTART ' + halfbar)
|
|
console.text.mark_set("restart", "end-1c")
|
|
console.text.mark_gravity("restart", "left")
|
|
console.showprompt()
|
|
# restart subprocess debugger
|
|
if debug:
|
|
# Restarted debugger connects to current instance of debug GUI
|
|
gui = RemoteDebugger.restart_subprocess_debugger(self.rpcclt)
|
|
# reload remote debugger breakpoints for all PyShellEditWindows
|
|
debug.load_breakpoints()
|
|
self.restarting = False
|
|
return self.rpcclt
|
|
|
|
def __request_interrupt(self):
|
|
self.rpcclt.remotecall("exec", "interrupt_the_server", (), {})
|
|
|
|
def interrupt_subprocess(self):
|
|
threading.Thread(target=self.__request_interrupt).start()
|
|
|
|
def kill_subprocess(self):
|
|
try:
|
|
self.rpcclt.close()
|
|
except AttributeError: # no socket
|
|
pass
|
|
self.unix_terminate()
|
|
self.tkconsole.executing = False
|
|
self.rpcclt = None
|
|
|
|
def unix_terminate(self):
|
|
"UNIX: make sure subprocess is terminated and collect status"
|
|
if hasattr(os, 'kill'):
|
|
try:
|
|
os.kill(self.rpcpid, SIGTERM)
|
|
except OSError:
|
|
# process already terminated:
|
|
return
|
|
else:
|
|
try:
|
|
os.waitpid(self.rpcpid, 0)
|
|
except OSError:
|
|
return
|
|
|
|
def transfer_path(self):
|
|
self.runcommand("""if 1:
|
|
import sys as _sys
|
|
_sys.path = %r
|
|
del _sys
|
|
\n""" % (sys.path,))
|
|
|
|
active_seq = None
|
|
|
|
def poll_subprocess(self):
|
|
clt = self.rpcclt
|
|
if clt is None:
|
|
return
|
|
try:
|
|
response = clt.pollresponse(self.active_seq, wait=0.05)
|
|
except (EOFError, IOError, KeyboardInterrupt):
|
|
# lost connection or subprocess terminated itself, restart
|
|
# [the KBI is from rpc.SocketIO.handle_EOF()]
|
|
if self.tkconsole.closing:
|
|
return
|
|
response = None
|
|
self.restart_subprocess()
|
|
if response:
|
|
self.tkconsole.resetoutput()
|
|
self.active_seq = None
|
|
how, what = response
|
|
console = self.tkconsole.console
|
|
if how == "OK":
|
|
if what is not None:
|
|
print(repr(what), file=console)
|
|
elif how == "EXCEPTION":
|
|
if self.tkconsole.getvar("<<toggle-jit-stack-viewer>>"):
|
|
self.remote_stack_viewer()
|
|
elif how == "ERROR":
|
|
errmsg = "PyShell.ModifiedInterpreter: Subprocess ERROR:\n"
|
|
print(errmsg, what, file=sys.__stderr__)
|
|
print(errmsg, what, file=console)
|
|
# we received a response to the currently active seq number:
|
|
try:
|
|
self.tkconsole.endexecuting()
|
|
except AttributeError: # shell may have closed
|
|
pass
|
|
# Reschedule myself
|
|
if not self.tkconsole.closing:
|
|
self.tkconsole.text.after(self.tkconsole.pollinterval,
|
|
self.poll_subprocess)
|
|
|
|
debugger = None
|
|
|
|
def setdebugger(self, debugger):
|
|
self.debugger = debugger
|
|
|
|
def getdebugger(self):
|
|
return self.debugger
|
|
|
|
def open_remote_stack_viewer(self):
|
|
"""Initiate the remote stack viewer from a separate thread.
|
|
|
|
This method is called from the subprocess, and by returning from this
|
|
method we allow the subprocess to unblock. After a bit the shell
|
|
requests the subprocess to open the remote stack viewer which returns a
|
|
static object looking at the last exceptiopn. It is queried through
|
|
the RPC mechanism.
|
|
|
|
"""
|
|
self.tkconsole.text.after(300, self.remote_stack_viewer)
|
|
return
|
|
|
|
def remote_stack_viewer(self):
|
|
from idlelib import RemoteObjectBrowser
|
|
oid = self.rpcclt.remotequeue("exec", "stackviewer", ("flist",), {})
|
|
if oid is None:
|
|
self.tkconsole.root.bell()
|
|
return
|
|
item = RemoteObjectBrowser.StubObjectTreeItem(self.rpcclt, oid)
|
|
from idlelib.TreeWidget import ScrolledCanvas, TreeNode
|
|
top = Toplevel(self.tkconsole.root)
|
|
theme = idleConf.GetOption('main','Theme','name')
|
|
background = idleConf.GetHighlight(theme, 'normal')['background']
|
|
sc = ScrolledCanvas(top, bg=background, highlightthickness=0)
|
|
sc.frame.pack(expand=1, fill="both")
|
|
node = TreeNode(sc.canvas, None, item)
|
|
node.expand()
|
|
# XXX Should GC the remote tree when closing the window
|
|
|
|
gid = 0
|
|
|
|
def execsource(self, source):
|
|
"Like runsource() but assumes complete exec source"
|
|
filename = self.stuffsource(source)
|
|
self.execfile(filename, source)
|
|
|
|
def execfile(self, filename, source=None):
|
|
"Execute an existing file"
|
|
if source is None:
|
|
source = open(filename, "r").read()
|
|
try:
|
|
code = compile(source, filename, "exec")
|
|
except (OverflowError, SyntaxError):
|
|
self.tkconsole.resetoutput()
|
|
tkerr = self.tkconsole.stderr
|
|
print('*** Error in script or command!\n', file=tkerr)
|
|
print('Traceback (most recent call last):', file=tkerr)
|
|
InteractiveInterpreter.showsyntaxerror(self, filename)
|
|
self.tkconsole.showprompt()
|
|
else:
|
|
self.runcode(code)
|
|
|
|
def runsource(self, source):
|
|
"Extend base class method: Stuff the source in the line cache first"
|
|
filename = self.stuffsource(source)
|
|
self.more = 0
|
|
self.save_warnings_filters = warnings.filters[:]
|
|
warnings.filterwarnings(action="error", category=SyntaxWarning)
|
|
# at the moment, InteractiveInterpreter expects str
|
|
assert isinstance(source, str)
|
|
#if isinstance(source, str):
|
|
# from idlelib import IOBinding
|
|
# try:
|
|
# source = source.encode(IOBinding.encoding)
|
|
# except UnicodeError:
|
|
# self.tkconsole.resetoutput()
|
|
# self.write("Unsupported characters in input\n")
|
|
# return
|
|
try:
|
|
# InteractiveInterpreter.runsource() calls its runcode() method,
|
|
# which is overridden (see below)
|
|
return InteractiveInterpreter.runsource(self, source, filename)
|
|
finally:
|
|
if self.save_warnings_filters is not None:
|
|
warnings.filters[:] = self.save_warnings_filters
|
|
self.save_warnings_filters = None
|
|
|
|
def stuffsource(self, source):
|
|
"Stuff source in the filename cache"
|
|
filename = "<pyshell#%d>" % self.gid
|
|
self.gid = self.gid + 1
|
|
lines = source.split("\n")
|
|
linecache.cache[filename] = len(source)+1, 0, lines, filename
|
|
return filename
|
|
|
|
def prepend_syspath(self, filename):
|
|
"Prepend sys.path with file's directory if not already included"
|
|
self.runcommand("""if 1:
|
|
_filename = %r
|
|
import sys as _sys
|
|
from os.path import dirname as _dirname
|
|
_dir = _dirname(_filename)
|
|
if not _dir in _sys.path:
|
|
_sys.path.insert(0, _dir)
|
|
del _filename, _sys, _dirname, _dir
|
|
\n""" % (filename,))
|
|
|
|
def showsyntaxerror(self, filename=None):
|
|
"""Override Interactive Interpreter method: Use Colorizing
|
|
|
|
Color the offending position instead of printing it and pointing at it
|
|
with a caret.
|
|
|
|
"""
|
|
tkconsole = self.tkconsole
|
|
text = tkconsole.text
|
|
text.tag_remove("ERROR", "1.0", "end")
|
|
type, value, tb = sys.exc_info()
|
|
msg = value.msg or "<no detail available>"
|
|
lineno = value.lineno or 1
|
|
offset = value.offset or 0
|
|
if offset == 0:
|
|
lineno += 1 #mark end of offending line
|
|
if lineno == 1:
|
|
pos = "iomark + %d chars" % (offset-1)
|
|
else:
|
|
pos = "iomark linestart + %d lines + %d chars" % \
|
|
(lineno-1, offset-1)
|
|
tkconsole.colorize_syntax_error(text, pos)
|
|
tkconsole.resetoutput()
|
|
self.write("SyntaxError: %s\n" % msg)
|
|
tkconsole.showprompt()
|
|
|
|
def showtraceback(self):
|
|
"Extend base class method to reset output properly"
|
|
self.tkconsole.resetoutput()
|
|
self.checklinecache()
|
|
InteractiveInterpreter.showtraceback(self)
|
|
if self.tkconsole.getvar("<<toggle-jit-stack-viewer>>"):
|
|
self.tkconsole.open_stack_viewer()
|
|
|
|
def checklinecache(self):
|
|
c = linecache.cache
|
|
for key in list(c.keys()):
|
|
if key[:1] + key[-1:] != "<>":
|
|
del c[key]
|
|
|
|
def runcommand(self, code):
|
|
"Run the code without invoking the debugger"
|
|
# The code better not raise an exception!
|
|
if self.tkconsole.executing:
|
|
self.display_executing_dialog()
|
|
return 0
|
|
if self.rpcclt:
|
|
self.rpcclt.remotequeue("exec", "runcode", (code,), {})
|
|
else:
|
|
exec(code, self.locals)
|
|
return 1
|
|
|
|
def runcode(self, code):
|
|
"Override base class method"
|
|
if self.tkconsole.executing:
|
|
self.interp.restart_subprocess()
|
|
self.checklinecache()
|
|
if self.save_warnings_filters is not None:
|
|
warnings.filters[:] = self.save_warnings_filters
|
|
self.save_warnings_filters = None
|
|
debugger = self.debugger
|
|
try:
|
|
self.tkconsole.beginexecuting()
|
|
if not debugger and self.rpcclt is not None:
|
|
self.active_seq = self.rpcclt.asyncqueue("exec", "runcode",
|
|
(code,), {})
|
|
elif debugger:
|
|
debugger.run(code, self.locals)
|
|
else:
|
|
exec(code, self.locals)
|
|
except SystemExit:
|
|
if not self.tkconsole.closing:
|
|
if tkMessageBox.askyesno(
|
|
"Exit?",
|
|
"Do you want to exit altogether?",
|
|
default="yes",
|
|
master=self.tkconsole.text):
|
|
raise
|
|
else:
|
|
self.showtraceback()
|
|
else:
|
|
raise
|
|
except:
|
|
if use_subprocess:
|
|
print("IDLE internal error in runcode()",
|
|
file=self.tkconsole.stderr)
|
|
self.showtraceback()
|
|
self.tkconsole.endexecuting()
|
|
else:
|
|
if self.tkconsole.canceled:
|
|
self.tkconsole.canceled = False
|
|
print("KeyboardInterrupt", file=self.tkconsole.stderr)
|
|
else:
|
|
self.showtraceback()
|
|
finally:
|
|
if not use_subprocess:
|
|
try:
|
|
self.tkconsole.endexecuting()
|
|
except AttributeError: # shell may have closed
|
|
pass
|
|
|
|
def write(self, s):
|
|
"Override base class method"
|
|
self.tkconsole.stderr.write(s)
|
|
|
|
def display_port_binding_error(self):
|
|
tkMessageBox.showerror(
|
|
"Port Binding Error",
|
|
"IDLE can't bind TCP/IP port 8833, which is necessary to "
|
|
"communicate with its Python execution server. Either "
|
|
"no networking is installed on this computer or another "
|
|
"process (another IDLE?) is using the port. Run IDLE with the -n "
|
|
"command line switch to start without a subprocess and refer to "
|
|
"Help/IDLE Help 'Running without a subprocess' for further "
|
|
"details.",
|
|
master=self.tkconsole.text)
|
|
|
|
def display_no_subprocess_error(self):
|
|
tkMessageBox.showerror(
|
|
"Subprocess Startup Error",
|
|
"IDLE's subprocess didn't make connection. Either IDLE can't "
|
|
"start a subprocess or personal firewall software is blocking "
|
|
"the connection.",
|
|
master=self.tkconsole.text)
|
|
|
|
def display_executing_dialog(self):
|
|
tkMessageBox.showerror(
|
|
"Already executing",
|
|
"The Python Shell window is already executing a command; "
|
|
"please wait until it is finished.",
|
|
master=self.tkconsole.text)
|
|
|
|
|
|
class PyShell(OutputWindow):
|
|
|
|
shell_title = "Python Shell"
|
|
|
|
# Override classes
|
|
ColorDelegator = ModifiedColorDelegator
|
|
UndoDelegator = ModifiedUndoDelegator
|
|
|
|
# Override menus
|
|
menu_specs = [
|
|
("file", "_File"),
|
|
("edit", "_Edit"),
|
|
("debug", "_Debug"),
|
|
("options", "_Options"),
|
|
("windows", "_Windows"),
|
|
("help", "_Help"),
|
|
]
|
|
|
|
if macosxSupport.runningAsOSXApp():
|
|
del menu_specs[-3]
|
|
menu_specs[-2] = ("windows", "_Window")
|
|
|
|
|
|
# New classes
|
|
from idlelib.IdleHistory import History
|
|
|
|
def __init__(self, flist=None):
|
|
if use_subprocess:
|
|
ms = self.menu_specs
|
|
if ms[2][0] != "shell":
|
|
ms.insert(2, ("shell", "She_ll"))
|
|
self.interp = ModifiedInterpreter(self)
|
|
if flist is None:
|
|
root = Tk()
|
|
fixwordbreaks(root)
|
|
root.withdraw()
|
|
flist = PyShellFileList(root)
|
|
#
|
|
OutputWindow.__init__(self, flist, None, None)
|
|
#
|
|
## self.config(usetabs=1, indentwidth=8, context_use_ps1=1)
|
|
self.usetabs = True
|
|
# indentwidth must be 8 when using tabs. See note in EditorWindow:
|
|
self.indentwidth = 8
|
|
self.context_use_ps1 = True
|
|
#
|
|
text = self.text
|
|
text.configure(wrap="char")
|
|
text.bind("<<newline-and-indent>>", self.enter_callback)
|
|
text.bind("<<plain-newline-and-indent>>", self.linefeed_callback)
|
|
text.bind("<<interrupt-execution>>", self.cancel_callback)
|
|
text.bind("<<beginning-of-line>>", self.home_callback)
|
|
text.bind("<<end-of-file>>", self.eof_callback)
|
|
text.bind("<<open-stack-viewer>>", self.open_stack_viewer)
|
|
text.bind("<<toggle-debugger>>", self.toggle_debugger)
|
|
text.bind("<<toggle-jit-stack-viewer>>", self.toggle_jit_stack_viewer)
|
|
if use_subprocess:
|
|
text.bind("<<view-restart>>", self.view_restart_mark)
|
|
text.bind("<<restart-shell>>", self.restart_shell)
|
|
#
|
|
self.save_stdout = sys.stdout
|
|
self.save_stderr = sys.stderr
|
|
self.save_stdin = sys.stdin
|
|
from idlelib import IOBinding
|
|
self.stdout = PseudoFile(self, "stdout", IOBinding.encoding)
|
|
self.stderr = PseudoFile(self, "stderr", IOBinding.encoding)
|
|
self.console = PseudoFile(self, "console", IOBinding.encoding)
|
|
if not use_subprocess:
|
|
sys.stdout = self.stdout
|
|
sys.stderr = self.stderr
|
|
sys.stdin = self
|
|
#
|
|
self.history = self.History(self.text)
|
|
#
|
|
self.pollinterval = 50 # millisec
|
|
|
|
def get_standard_extension_names(self):
|
|
return idleConf.GetExtensions(shell_only=True)
|
|
|
|
reading = False
|
|
executing = False
|
|
canceled = False
|
|
endoffile = False
|
|
closing = False
|
|
|
|
def set_warning_stream(self, stream):
|
|
global warning_stream
|
|
warning_stream = stream
|
|
|
|
def get_warning_stream(self):
|
|
return warning_stream
|
|
|
|
def toggle_debugger(self, event=None):
|
|
if self.executing:
|
|
tkMessageBox.showerror("Don't debug now",
|
|
"You can only toggle the debugger when idle",
|
|
master=self.text)
|
|
self.set_debugger_indicator()
|
|
return "break"
|
|
else:
|
|
db = self.interp.getdebugger()
|
|
if db:
|
|
self.close_debugger()
|
|
else:
|
|
self.open_debugger()
|
|
|
|
def set_debugger_indicator(self):
|
|
db = self.interp.getdebugger()
|
|
self.setvar("<<toggle-debugger>>", not not db)
|
|
|
|
def toggle_jit_stack_viewer(self, event=None):
|
|
pass # All we need is the variable
|
|
|
|
def close_debugger(self):
|
|
db = self.interp.getdebugger()
|
|
if db:
|
|
self.interp.setdebugger(None)
|
|
db.close()
|
|
if self.interp.rpcclt:
|
|
RemoteDebugger.close_remote_debugger(self.interp.rpcclt)
|
|
self.resetoutput()
|
|
self.console.write("[DEBUG OFF]\n")
|
|
sys.ps1 = ">>> "
|
|
self.showprompt()
|
|
self.set_debugger_indicator()
|
|
|
|
def open_debugger(self):
|
|
if self.interp.rpcclt:
|
|
dbg_gui = RemoteDebugger.start_remote_debugger(self.interp.rpcclt,
|
|
self)
|
|
else:
|
|
dbg_gui = Debugger.Debugger(self)
|
|
self.interp.setdebugger(dbg_gui)
|
|
dbg_gui.load_breakpoints()
|
|
sys.ps1 = "[DEBUG ON]\n>>> "
|
|
self.showprompt()
|
|
self.set_debugger_indicator()
|
|
|
|
def beginexecuting(self):
|
|
"Helper for ModifiedInterpreter"
|
|
self.resetoutput()
|
|
self.executing = 1
|
|
|
|
def endexecuting(self):
|
|
"Helper for ModifiedInterpreter"
|
|
self.executing = 0
|
|
self.canceled = 0
|
|
self.showprompt()
|
|
|
|
def close(self):
|
|
"Extend EditorWindow.close()"
|
|
if self.executing:
|
|
response = tkMessageBox.askokcancel(
|
|
"Kill?",
|
|
"The program is still running!\n Do you want to kill it?",
|
|
default="ok",
|
|
parent=self.text)
|
|
if response == False:
|
|
return "cancel"
|
|
if self.reading:
|
|
self.top.quit()
|
|
self.canceled = True
|
|
self.closing = True
|
|
# Wait for poll_subprocess() rescheduling to stop
|
|
self.text.after(2 * self.pollinterval, self.close2)
|
|
|
|
def close2(self):
|
|
return EditorWindow.close(self)
|
|
|
|
def _close(self):
|
|
"Extend EditorWindow._close(), shut down debugger and execution server"
|
|
self.close_debugger()
|
|
if use_subprocess:
|
|
self.interp.kill_subprocess()
|
|
# Restore std streams
|
|
sys.stdout = self.save_stdout
|
|
sys.stderr = self.save_stderr
|
|
sys.stdin = self.save_stdin
|
|
# Break cycles
|
|
self.interp = None
|
|
self.console = None
|
|
self.flist.pyshell = None
|
|
self.history = None
|
|
EditorWindow._close(self)
|
|
|
|
def ispythonsource(self, filename):
|
|
"Override EditorWindow method: never remove the colorizer"
|
|
return True
|
|
|
|
def short_title(self):
|
|
return self.shell_title
|
|
|
|
COPYRIGHT = \
|
|
'Type "copyright", "credits" or "license()" for more information.'
|
|
|
|
firewallmessage = """
|
|
****************************************************************
|
|
Personal firewall software may warn about the connection IDLE
|
|
makes to its subprocess using this computer's internal loopback
|
|
interface. This connection is not visible on any external
|
|
interface and no data is sent to or received from the Internet.
|
|
****************************************************************
|
|
"""
|
|
|
|
def begin(self):
|
|
self.text.mark_set("iomark", "insert")
|
|
self.resetoutput()
|
|
if use_subprocess:
|
|
nosub = ''
|
|
client = self.interp.start_subprocess()
|
|
if not client:
|
|
self.close()
|
|
return False
|
|
else:
|
|
nosub = "==== No Subprocess ===="
|
|
self.write("Python %s on %s\n%s\n%s\nIDLE %s %s\n" %
|
|
(sys.version, sys.platform, self.COPYRIGHT,
|
|
self.firewallmessage, idlever.IDLE_VERSION, nosub))
|
|
self.showprompt()
|
|
import Tkinter
|
|
Tkinter._default_root = None # 03Jan04 KBK What's this?
|
|
return True
|
|
|
|
def readline(self):
|
|
save = self.reading
|
|
try:
|
|
self.reading = 1
|
|
self.top.mainloop() # nested mainloop()
|
|
finally:
|
|
self.reading = save
|
|
line = self.text.get("iomark", "end-1c")
|
|
if len(line) == 0: # may be EOF if we quit our mainloop with Ctrl-C
|
|
line = "\n"
|
|
self.resetoutput()
|
|
if self.canceled:
|
|
self.canceled = 0
|
|
if not use_subprocess:
|
|
raise KeyboardInterrupt
|
|
if self.endoffile:
|
|
self.endoffile = 0
|
|
line = ""
|
|
return line
|
|
|
|
def isatty(self):
|
|
return True
|
|
|
|
def cancel_callback(self, event=None):
|
|
try:
|
|
if self.text.compare("sel.first", "!=", "sel.last"):
|
|
return # Active selection -- always use default binding
|
|
except:
|
|
pass
|
|
if not (self.executing or self.reading):
|
|
self.resetoutput()
|
|
self.interp.write("KeyboardInterrupt\n")
|
|
self.showprompt()
|
|
return "break"
|
|
self.endoffile = 0
|
|
self.canceled = 1
|
|
if (self.executing and self.interp.rpcclt):
|
|
if self.interp.getdebugger():
|
|
self.interp.restart_subprocess()
|
|
else:
|
|
self.interp.interrupt_subprocess()
|
|
if self.reading:
|
|
self.top.quit() # exit the nested mainloop() in readline()
|
|
return "break"
|
|
|
|
def eof_callback(self, event):
|
|
if self.executing and not self.reading:
|
|
return # Let the default binding (delete next char) take over
|
|
if not (self.text.compare("iomark", "==", "insert") and
|
|
self.text.compare("insert", "==", "end-1c")):
|
|
return # Let the default binding (delete next char) take over
|
|
if not self.executing:
|
|
self.resetoutput()
|
|
self.close()
|
|
else:
|
|
self.canceled = 0
|
|
self.endoffile = 1
|
|
self.top.quit()
|
|
return "break"
|
|
|
|
def home_callback(self, event):
|
|
if event.state != 0 and event.keysym == "Home":
|
|
return # <Modifier-Home>; fall back to class binding
|
|
if self.text.compare("iomark", "<=", "insert") and \
|
|
self.text.compare("insert linestart", "<=", "iomark"):
|
|
self.text.mark_set("insert", "iomark")
|
|
self.text.tag_remove("sel", "1.0", "end")
|
|
self.text.see("insert")
|
|
return "break"
|
|
|
|
def linefeed_callback(self, event):
|
|
# Insert a linefeed without entering anything (still autoindented)
|
|
if self.reading:
|
|
self.text.insert("insert", "\n")
|
|
self.text.see("insert")
|
|
else:
|
|
self.newline_and_indent_event(event)
|
|
return "break"
|
|
|
|
def enter_callback(self, event):
|
|
if self.executing and not self.reading:
|
|
return # Let the default binding (insert '\n') take over
|
|
# If some text is selected, recall the selection
|
|
# (but only if this before the I/O mark)
|
|
try:
|
|
sel = self.text.get("sel.first", "sel.last")
|
|
if sel:
|
|
if self.text.compare("sel.last", "<=", "iomark"):
|
|
self.recall(sel, event)
|
|
return "break"
|
|
except:
|
|
pass
|
|
# If we're strictly before the line containing iomark, recall
|
|
# the current line, less a leading prompt, less leading or
|
|
# trailing whitespace
|
|
if self.text.compare("insert", "<", "iomark linestart"):
|
|
# Check if there's a relevant stdin range -- if so, use it
|
|
prev = self.text.tag_prevrange("stdin", "insert")
|
|
if prev and self.text.compare("insert", "<", prev[1]):
|
|
self.recall(self.text.get(prev[0], prev[1]), event)
|
|
return "break"
|
|
next = self.text.tag_nextrange("stdin", "insert")
|
|
if next and self.text.compare("insert lineend", ">=", next[0]):
|
|
self.recall(self.text.get(next[0], next[1]), event)
|
|
return "break"
|
|
# No stdin mark -- just get the current line, less any prompt
|
|
indices = self.text.tag_nextrange("console", "insert linestart")
|
|
if indices and \
|
|
self.text.compare(indices[0], "<=", "insert linestart"):
|
|
self.recall(self.text.get(indices[1], "insert lineend"), event)
|
|
else:
|
|
self.recall(self.text.get("insert linestart", "insert lineend"), event)
|
|
return "break"
|
|
# If we're between the beginning of the line and the iomark, i.e.
|
|
# in the prompt area, move to the end of the prompt
|
|
if self.text.compare("insert", "<", "iomark"):
|
|
self.text.mark_set("insert", "iomark")
|
|
# If we're in the current input and there's only whitespace
|
|
# beyond the cursor, erase that whitespace first
|
|
s = self.text.get("insert", "end-1c")
|
|
if s and not s.strip():
|
|
self.text.delete("insert", "end-1c")
|
|
# If we're in the current input before its last line,
|
|
# insert a newline right at the insert point
|
|
if self.text.compare("insert", "<", "end-1c linestart"):
|
|
self.newline_and_indent_event(event)
|
|
return "break"
|
|
# We're in the last line; append a newline and submit it
|
|
self.text.mark_set("insert", "end-1c")
|
|
if self.reading:
|
|
self.text.insert("insert", "\n")
|
|
self.text.see("insert")
|
|
else:
|
|
self.newline_and_indent_event(event)
|
|
self.text.tag_add("stdin", "iomark", "end-1c")
|
|
self.text.update_idletasks()
|
|
if self.reading:
|
|
self.top.quit() # Break out of recursive mainloop()
|
|
else:
|
|
self.runit()
|
|
return "break"
|
|
|
|
def recall(self, s, event):
|
|
# remove leading and trailing empty or whitespace lines
|
|
s = re.sub(r'^\s*\n', '' , s)
|
|
s = re.sub(r'\n\s*$', '', s)
|
|
lines = s.split('\n')
|
|
self.text.undo_block_start()
|
|
try:
|
|
self.text.tag_remove("sel", "1.0", "end")
|
|
self.text.mark_set("insert", "end-1c")
|
|
prefix = self.text.get("insert linestart", "insert")
|
|
if prefix.rstrip().endswith(':'):
|
|
self.newline_and_indent_event(event)
|
|
prefix = self.text.get("insert linestart", "insert")
|
|
self.text.insert("insert", lines[0].strip())
|
|
if len(lines) > 1:
|
|
orig_base_indent = re.search(r'^([ \t]*)', lines[0]).group(0)
|
|
new_base_indent = re.search(r'^([ \t]*)', prefix).group(0)
|
|
for line in lines[1:]:
|
|
if line.startswith(orig_base_indent):
|
|
# replace orig base indentation with new indentation
|
|
line = new_base_indent + line[len(orig_base_indent):]
|
|
self.text.insert('insert', '\n'+line.rstrip())
|
|
finally:
|
|
self.text.see("insert")
|
|
self.text.undo_block_stop()
|
|
|
|
def runit(self):
|
|
line = self.text.get("iomark", "end-1c")
|
|
# Strip off last newline and surrounding whitespace.
|
|
# (To allow you to hit return twice to end a statement.)
|
|
i = len(line)
|
|
while i > 0 and line[i-1] in " \t":
|
|
i = i-1
|
|
if i > 0 and line[i-1] == "\n":
|
|
i = i-1
|
|
while i > 0 and line[i-1] in " \t":
|
|
i = i-1
|
|
line = line[:i]
|
|
more = self.interp.runsource(line)
|
|
|
|
def open_stack_viewer(self, event=None):
|
|
if self.interp.rpcclt:
|
|
return self.interp.remote_stack_viewer()
|
|
try:
|
|
sys.last_traceback
|
|
except:
|
|
tkMessageBox.showerror("No stack trace",
|
|
"There is no stack trace yet.\n"
|
|
"(sys.last_traceback is not defined)",
|
|
master=self.text)
|
|
return
|
|
from idlelib.StackViewer import StackBrowser
|
|
sv = StackBrowser(self.root, self.flist)
|
|
|
|
def view_restart_mark(self, event=None):
|
|
self.text.see("iomark")
|
|
self.text.see("restart")
|
|
|
|
def restart_shell(self, event=None):
|
|
self.interp.restart_subprocess()
|
|
|
|
def showprompt(self):
|
|
self.resetoutput()
|
|
try:
|
|
s = str(sys.ps1)
|
|
except:
|
|
s = ""
|
|
self.console.write(s)
|
|
self.text.mark_set("insert", "end-1c")
|
|
self.set_line_and_column()
|
|
self.io.reset_undo()
|
|
|
|
def resetoutput(self):
|
|
source = self.text.get("iomark", "end-1c")
|
|
if self.history:
|
|
self.history.history_store(source)
|
|
if self.text.get("end-2c") != "\n":
|
|
self.text.insert("end-1c", "\n")
|
|
self.text.mark_set("iomark", "end-1c")
|
|
self.set_line_and_column()
|
|
|
|
def write(self, s, tags=()):
|
|
try:
|
|
self.text.mark_gravity("iomark", "right")
|
|
OutputWindow.write(self, s, tags, "iomark")
|
|
self.text.mark_gravity("iomark", "left")
|
|
except:
|
|
raise ###pass # ### 11Aug07 KBK if we are expecting exceptions
|
|
# let's find out what they are and be specific.
|
|
if self.canceled:
|
|
self.canceled = 0
|
|
if not use_subprocess:
|
|
raise KeyboardInterrupt
|
|
|
|
class PseudoFile(object):
|
|
|
|
def __init__(self, shell, tags, encoding=None):
|
|
self.shell = shell
|
|
self.tags = tags
|
|
self.encoding = encoding
|
|
|
|
def write(self, s):
|
|
self.shell.write(s, self.tags)
|
|
|
|
def writelines(self, lines):
|
|
for line in lines:
|
|
self.write(line)
|
|
|
|
def flush(self):
|
|
pass
|
|
|
|
def isatty(self):
|
|
return True
|
|
|
|
|
|
usage_msg = """\
|
|
|
|
USAGE: idle [-deins] [-t title] [file]*
|
|
idle [-dns] [-t title] (-c cmd | -r file) [arg]*
|
|
idle [-dns] [-t title] - [arg]*
|
|
|
|
-h print this help message and exit
|
|
-n run IDLE without a subprocess (see Help/IDLE Help for details)
|
|
|
|
The following options will override the IDLE 'settings' configuration:
|
|
|
|
-e open an edit window
|
|
-i open a shell window
|
|
|
|
The following options imply -i and will open a shell:
|
|
|
|
-c cmd run the command in a shell, or
|
|
-r file run script from file
|
|
|
|
-d enable the debugger
|
|
-s run $IDLESTARTUP or $PYTHONSTARTUP before anything else
|
|
-t title set title of shell window
|
|
|
|
A default edit window will be bypassed when -c, -r, or - are used.
|
|
|
|
[arg]* are passed to the command (-c) or script (-r) in sys.argv[1:].
|
|
|
|
Examples:
|
|
|
|
idle
|
|
Open an edit window or shell depending on IDLE's configuration.
|
|
|
|
idle foo.py foobar.py
|
|
Edit the files, also open a shell if configured to start with shell.
|
|
|
|
idle -est "Baz" foo.py
|
|
Run $IDLESTARTUP or $PYTHONSTARTUP, edit foo.py, and open a shell
|
|
window with the title "Baz".
|
|
|
|
idle -c "import sys; print sys.argv" "foo"
|
|
Open a shell window and run the command, passing "-c" in sys.argv[0]
|
|
and "foo" in sys.argv[1].
|
|
|
|
idle -d -s -r foo.py "Hello World"
|
|
Open a shell window, run a startup script, enable the debugger, and
|
|
run foo.py, passing "foo.py" in sys.argv[0] and "Hello World" in
|
|
sys.argv[1].
|
|
|
|
echo "import sys; print sys.argv" | idle - "foobar"
|
|
Open a shell window, run the script piped in, passing '' in sys.argv[0]
|
|
and "foobar" in sys.argv[1].
|
|
"""
|
|
|
|
def main():
|
|
global flist, root, use_subprocess
|
|
|
|
use_subprocess = True
|
|
enable_shell = False
|
|
enable_edit = False
|
|
debug = False
|
|
cmd = None
|
|
script = None
|
|
startup = False
|
|
try:
|
|
opts, args = getopt.getopt(sys.argv[1:], "c:deihnr:st:")
|
|
except getopt.error as msg:
|
|
sys.stderr.write("Error: %s\n" % str(msg))
|
|
sys.stderr.write(usage_msg)
|
|
sys.exit(2)
|
|
for o, a in opts:
|
|
if o == '-c':
|
|
cmd = a
|
|
enable_shell = True
|
|
if o == '-d':
|
|
debug = True
|
|
enable_shell = True
|
|
if o == '-e':
|
|
enable_edit = True
|
|
if o == '-h':
|
|
sys.stdout.write(usage_msg)
|
|
sys.exit()
|
|
if o == '-i':
|
|
enable_shell = True
|
|
if o == '-n':
|
|
use_subprocess = False
|
|
if o == '-r':
|
|
script = a
|
|
if os.path.isfile(script):
|
|
pass
|
|
else:
|
|
print("No script file: ", script)
|
|
sys.exit()
|
|
enable_shell = True
|
|
if o == '-s':
|
|
startup = True
|
|
enable_shell = True
|
|
if o == '-t':
|
|
PyShell.shell_title = a
|
|
enable_shell = True
|
|
if args and args[0] == '-':
|
|
cmd = sys.stdin.read()
|
|
enable_shell = True
|
|
# process sys.argv and sys.path:
|
|
for i in range(len(sys.path)):
|
|
sys.path[i] = os.path.abspath(sys.path[i])
|
|
if args and args[0] == '-':
|
|
sys.argv = [''] + args[1:]
|
|
elif cmd:
|
|
sys.argv = ['-c'] + args
|
|
elif script:
|
|
sys.argv = [script] + args
|
|
elif args:
|
|
enable_edit = True
|
|
pathx = []
|
|
for filename in args:
|
|
pathx.append(os.path.dirname(filename))
|
|
for dir in pathx:
|
|
dir = os.path.abspath(dir)
|
|
if not dir in sys.path:
|
|
sys.path.insert(0, dir)
|
|
else:
|
|
dir = os.getcwd()
|
|
if dir not in sys.path:
|
|
sys.path.insert(0, dir)
|
|
# check the IDLE settings configuration (but command line overrides)
|
|
edit_start = idleConf.GetOption('main', 'General',
|
|
'editor-on-startup', type='bool')
|
|
enable_edit = enable_edit or edit_start
|
|
enable_shell = enable_shell or not edit_start
|
|
# start editor and/or shell windows:
|
|
root = Tk(className="Idle")
|
|
|
|
fixwordbreaks(root)
|
|
root.withdraw()
|
|
flist = PyShellFileList(root)
|
|
macosxSupport.setupApp(root, flist)
|
|
|
|
if enable_edit:
|
|
if not (cmd or script):
|
|
for filename in args:
|
|
flist.open(filename)
|
|
if not args:
|
|
flist.new()
|
|
if enable_shell:
|
|
shell = flist.open_shell()
|
|
if not shell:
|
|
return # couldn't open shell
|
|
|
|
if macosxSupport.runningAsOSXApp() and flist.dict:
|
|
# On OSX: when the user has double-clicked on a file that causes
|
|
# IDLE to be launched the shell window will open just in front of
|
|
# the file she wants to see. Lower the interpreter window when
|
|
# there are open files.
|
|
shell.top.lower()
|
|
|
|
shell = flist.pyshell
|
|
# handle remaining options:
|
|
if debug:
|
|
shell.open_debugger()
|
|
if startup:
|
|
filename = os.environ.get("IDLESTARTUP") or \
|
|
os.environ.get("PYTHONSTARTUP")
|
|
if filename and os.path.isfile(filename):
|
|
shell.interp.execfile(filename)
|
|
if shell and cmd or script:
|
|
shell.interp.runcommand("""if 1:
|
|
import sys as _sys
|
|
_sys.argv = %r
|
|
del _sys
|
|
\n""" % (sys.argv,))
|
|
if cmd:
|
|
shell.interp.execsource(cmd)
|
|
elif script:
|
|
shell.interp.prepend_syspath(script)
|
|
shell.interp.execfile(script)
|
|
|
|
root.mainloop()
|
|
root.destroy()
|
|
|
|
if __name__ == "__main__":
|
|
sys.modules['PyShell'] = sys.modules['__main__']
|
|
main()
|