mirror of
https://github.com/python/cpython.git
synced 2025-01-09 18:15:02 +08:00
8ce8a784bd
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. ........
1511 lines
57 KiB
Python
1511 lines
57 KiB
Python
import sys
|
|
import os
|
|
import re
|
|
import string
|
|
import imp
|
|
from itertools import count
|
|
from Tkinter import *
|
|
import tkSimpleDialog
|
|
import tkMessageBox
|
|
import traceback
|
|
import webbrowser
|
|
|
|
from idlelib.MultiCall import MultiCallCreator
|
|
from idlelib import idlever
|
|
from idlelib import WindowList
|
|
from idlelib import SearchDialog
|
|
from idlelib import GrepDialog
|
|
from idlelib import ReplaceDialog
|
|
from idlelib import PyParse
|
|
from idlelib.configHandler import idleConf
|
|
from idlelib import aboutDialog, textView, configDialog
|
|
from idlelib import macosxSupport
|
|
|
|
# The default tab setting for a Text widget, in average-width characters.
|
|
TK_TABWIDTH_DEFAULT = 8
|
|
|
|
def _find_module(fullname, path=None):
|
|
"""Version of imp.find_module() that handles hierarchical module names"""
|
|
|
|
file = None
|
|
for tgt in fullname.split('.'):
|
|
if file is not None:
|
|
file.close() # close intermediate files
|
|
(file, filename, descr) = imp.find_module(tgt, path)
|
|
if descr[2] == imp.PY_SOURCE:
|
|
break # find but not load the source file
|
|
module = imp.load_module(tgt, file, filename, descr)
|
|
try:
|
|
path = module.__path__
|
|
except AttributeError:
|
|
raise ImportError('No source for module ' + module.__name__)
|
|
return file, filename, descr
|
|
|
|
class EditorWindow(object):
|
|
from idlelib.Percolator import Percolator
|
|
from idlelib.ColorDelegator import ColorDelegator
|
|
from idlelib.UndoDelegator import UndoDelegator
|
|
from idlelib.IOBinding import IOBinding, filesystemencoding, encoding
|
|
from idlelib import Bindings
|
|
from Tkinter import Toplevel
|
|
from idlelib.MultiStatusBar import MultiStatusBar
|
|
|
|
help_url = None
|
|
|
|
def __init__(self, flist=None, filename=None, key=None, root=None):
|
|
if EditorWindow.help_url is None:
|
|
dochome = os.path.join(sys.prefix, 'Doc', 'index.html')
|
|
if sys.platform.count('linux'):
|
|
# look for html docs in a couple of standard places
|
|
pyver = 'python-docs-' + '%s.%s.%s' % sys.version_info[:3]
|
|
if os.path.isdir('/var/www/html/python/'): # "python2" rpm
|
|
dochome = '/var/www/html/python/index.html'
|
|
else:
|
|
basepath = '/usr/share/doc/' # standard location
|
|
dochome = os.path.join(basepath, pyver,
|
|
'Doc', 'index.html')
|
|
elif sys.platform[:3] == 'win':
|
|
chmfile = os.path.join(sys.prefix, 'Doc',
|
|
'Python%d%d.chm' % sys.version_info[:2])
|
|
if os.path.isfile(chmfile):
|
|
dochome = chmfile
|
|
|
|
elif macosxSupport.runningAsOSXApp():
|
|
# documentation is stored inside the python framework
|
|
dochome = os.path.join(sys.prefix,
|
|
'Resources/English.lproj/Documentation/index.html')
|
|
|
|
dochome = os.path.normpath(dochome)
|
|
if os.path.isfile(dochome):
|
|
EditorWindow.help_url = dochome
|
|
if sys.platform == 'darwin':
|
|
# Safari requires real file:-URLs
|
|
EditorWindow.help_url = 'file://' + EditorWindow.help_url
|
|
else:
|
|
EditorWindow.help_url = "http://docs.python.org/dev/3.0/"
|
|
currentTheme=idleConf.CurrentTheme()
|
|
self.flist = flist
|
|
root = root or flist.root
|
|
self.root = root
|
|
try:
|
|
sys.ps1
|
|
except AttributeError:
|
|
sys.ps1 = '>>> '
|
|
self.menubar = Menu(root)
|
|
self.top = top = WindowList.ListedToplevel(root, menu=self.menubar)
|
|
if flist:
|
|
self.tkinter_vars = flist.vars
|
|
#self.top.instance_dict makes flist.inversedict avalable to
|
|
#configDialog.py so it can access all EditorWindow instaces
|
|
self.top.instance_dict = flist.inversedict
|
|
else:
|
|
self.tkinter_vars = {} # keys: Tkinter event names
|
|
# values: Tkinter variable instances
|
|
self.top.instance_dict = {}
|
|
self.recent_files_path = os.path.join(idleConf.GetUserCfgDir(),
|
|
'recent-files.lst')
|
|
self.text_frame = text_frame = Frame(top)
|
|
self.vbar = vbar = Scrollbar(text_frame, name='vbar')
|
|
self.width = idleConf.GetOption('main','EditorWindow','width')
|
|
self.text = text = MultiCallCreator(Text)(
|
|
text_frame, name='text', padx=5, wrap='none',
|
|
foreground=idleConf.GetHighlight(currentTheme,
|
|
'normal',fgBg='fg'),
|
|
background=idleConf.GetHighlight(currentTheme,
|
|
'normal',fgBg='bg'),
|
|
highlightcolor=idleConf.GetHighlight(currentTheme,
|
|
'hilite',fgBg='fg'),
|
|
highlightbackground=idleConf.GetHighlight(currentTheme,
|
|
'hilite',fgBg='bg'),
|
|
insertbackground=idleConf.GetHighlight(currentTheme,
|
|
'cursor',fgBg='fg'),
|
|
width=self.width,
|
|
height=idleConf.GetOption('main','EditorWindow','height') )
|
|
self.top.focused_widget = self.text
|
|
|
|
self.createmenubar()
|
|
self.apply_bindings()
|
|
|
|
self.top.protocol("WM_DELETE_WINDOW", self.close)
|
|
self.top.bind("<<close-window>>", self.close_event)
|
|
if macosxSupport.runningAsOSXApp():
|
|
# Command-W on editorwindows doesn't work without this.
|
|
text.bind('<<close-window>>', self.close_event)
|
|
text.bind("<<cut>>", self.cut)
|
|
text.bind("<<copy>>", self.copy)
|
|
text.bind("<<paste>>", self.paste)
|
|
text.bind("<<center-insert>>", self.center_insert_event)
|
|
text.bind("<<help>>", self.help_dialog)
|
|
text.bind("<<python-docs>>", self.python_docs)
|
|
text.bind("<<about-idle>>", self.about_dialog)
|
|
text.bind("<<open-config-dialog>>", self.config_dialog)
|
|
text.bind("<<open-module>>", self.open_module)
|
|
text.bind("<<do-nothing>>", lambda event: "break")
|
|
text.bind("<<select-all>>", self.select_all)
|
|
text.bind("<<remove-selection>>", self.remove_selection)
|
|
text.bind("<<find>>", self.find_event)
|
|
text.bind("<<find-again>>", self.find_again_event)
|
|
text.bind("<<find-in-files>>", self.find_in_files_event)
|
|
text.bind("<<find-selection>>", self.find_selection_event)
|
|
text.bind("<<replace>>", self.replace_event)
|
|
text.bind("<<goto-line>>", self.goto_line_event)
|
|
text.bind("<3>", self.right_menu_event)
|
|
text.bind("<<smart-backspace>>",self.smart_backspace_event)
|
|
text.bind("<<newline-and-indent>>",self.newline_and_indent_event)
|
|
text.bind("<<smart-indent>>",self.smart_indent_event)
|
|
text.bind("<<indent-region>>",self.indent_region_event)
|
|
text.bind("<<dedent-region>>",self.dedent_region_event)
|
|
text.bind("<<comment-region>>",self.comment_region_event)
|
|
text.bind("<<uncomment-region>>",self.uncomment_region_event)
|
|
text.bind("<<tabify-region>>",self.tabify_region_event)
|
|
text.bind("<<untabify-region>>",self.untabify_region_event)
|
|
text.bind("<<toggle-tabs>>",self.toggle_tabs_event)
|
|
text.bind("<<change-indentwidth>>",self.change_indentwidth_event)
|
|
text.bind("<Left>", self.move_at_edge_if_selection(0))
|
|
text.bind("<Right>", self.move_at_edge_if_selection(1))
|
|
text.bind("<<del-word-left>>", self.del_word_left)
|
|
text.bind("<<del-word-right>>", self.del_word_right)
|
|
|
|
if flist:
|
|
flist.inversedict[self] = key
|
|
if key:
|
|
flist.dict[key] = self
|
|
text.bind("<<open-new-window>>", self.new_callback)
|
|
text.bind("<<close-all-windows>>", self.flist.close_all_callback)
|
|
text.bind("<<open-class-browser>>", self.open_class_browser)
|
|
text.bind("<<open-path-browser>>", self.open_path_browser)
|
|
|
|
self.set_status_bar()
|
|
vbar['command'] = text.yview
|
|
vbar.pack(side=RIGHT, fill=Y)
|
|
text['yscrollcommand'] = vbar.set
|
|
fontWeight = 'normal'
|
|
if idleConf.GetOption('main', 'EditorWindow', 'font-bold', type='bool'):
|
|
fontWeight='bold'
|
|
text.config(font=(idleConf.GetOption('main', 'EditorWindow', 'font'),
|
|
idleConf.GetOption('main', 'EditorWindow', 'font-size'),
|
|
fontWeight))
|
|
text_frame.pack(side=LEFT, fill=BOTH, expand=1)
|
|
text.pack(side=TOP, fill=BOTH, expand=1)
|
|
text.focus_set()
|
|
|
|
# usetabs true -> literal tab characters are used by indent and
|
|
# dedent cmds, possibly mixed with spaces if
|
|
# indentwidth is not a multiple of tabwidth,
|
|
# which will cause Tabnanny to nag!
|
|
# false -> tab characters are converted to spaces by indent
|
|
# and dedent cmds, and ditto TAB keystrokes
|
|
# Although use-spaces=0 can be configured manually in config-main.def,
|
|
# configuration of tabs v. spaces is not supported in the configuration
|
|
# dialog. IDLE promotes the preferred Python indentation: use spaces!
|
|
usespaces = idleConf.GetOption('main', 'Indent', 'use-spaces', type='bool')
|
|
self.usetabs = not usespaces
|
|
|
|
# tabwidth is the display width of a literal tab character.
|
|
# CAUTION: telling Tk to use anything other than its default
|
|
# tab setting causes it to use an entirely different tabbing algorithm,
|
|
# treating tab stops as fixed distances from the left margin.
|
|
# Nobody expects this, so for now tabwidth should never be changed.
|
|
self.tabwidth = 8 # must remain 8 until Tk is fixed.
|
|
|
|
# indentwidth is the number of screen characters per indent level.
|
|
# The recommended Python indentation is four spaces.
|
|
self.indentwidth = self.tabwidth
|
|
self.set_notabs_indentwidth()
|
|
|
|
# If context_use_ps1 is true, parsing searches back for a ps1 line;
|
|
# else searches for a popular (if, def, ...) Python stmt.
|
|
self.context_use_ps1 = False
|
|
|
|
# When searching backwards for a reliable place to begin parsing,
|
|
# first start num_context_lines[0] lines back, then
|
|
# num_context_lines[1] lines back if that didn't work, and so on.
|
|
# The last value should be huge (larger than the # of lines in a
|
|
# conceivable file).
|
|
# Making the initial values larger slows things down more often.
|
|
self.num_context_lines = 50, 500, 5000000
|
|
self.per = per = self.Percolator(text)
|
|
self.color = None
|
|
self.undo = undo = self.UndoDelegator()
|
|
per.insertfilter(undo)
|
|
text.undo_block_start = undo.undo_block_start
|
|
text.undo_block_stop = undo.undo_block_stop
|
|
undo.set_saved_change_hook(self.saved_change_hook)
|
|
# IOBinding implements file I/O and printing functionality
|
|
self.io = io = self.IOBinding(self)
|
|
io.set_filename_change_hook(self.filename_change_hook)
|
|
self.good_load = False
|
|
self.set_indentation_params(False)
|
|
if filename:
|
|
if os.path.exists(filename) and not os.path.isdir(filename):
|
|
if io.loadfile(filename):
|
|
self.good_load = True
|
|
is_py_src = self.ispythonsource(filename)
|
|
self.set_indentation_params(is_py_src)
|
|
if is_py_src:
|
|
self.color = color = self.ColorDelegator()
|
|
per.insertfilter(color)
|
|
else:
|
|
io.set_filename(filename)
|
|
self.saved_change_hook()
|
|
self.update_recent_files_list()
|
|
self.load_extensions()
|
|
menu = self.menudict.get('windows')
|
|
if menu:
|
|
end = menu.index("end")
|
|
if end is None:
|
|
end = -1
|
|
if end >= 0:
|
|
menu.add_separator()
|
|
end = end + 1
|
|
self.wmenu_end = end
|
|
WindowList.register_callback(self.postwindowsmenu)
|
|
|
|
# Some abstractions so IDLE extensions are cross-IDE
|
|
self.askyesno = tkMessageBox.askyesno
|
|
self.askinteger = tkSimpleDialog.askinteger
|
|
self.showerror = tkMessageBox.showerror
|
|
|
|
def _filename_to_unicode(self, filename):
|
|
"""convert filename to unicode in order to display it in Tk"""
|
|
if isinstance(filename, str) or not filename:
|
|
return filename
|
|
else:
|
|
try:
|
|
return filename.decode(self.filesystemencoding)
|
|
except UnicodeDecodeError:
|
|
# XXX
|
|
try:
|
|
return filename.decode(self.encoding)
|
|
except UnicodeDecodeError:
|
|
# byte-to-byte conversion
|
|
return filename.decode('iso8859-1')
|
|
|
|
def new_callback(self, event):
|
|
dirname, basename = self.io.defaultfilename()
|
|
self.flist.new(dirname)
|
|
return "break"
|
|
|
|
def set_status_bar(self):
|
|
self.status_bar = self.MultiStatusBar(self.top)
|
|
if macosxSupport.runningAsOSXApp():
|
|
# Insert some padding to avoid obscuring some of the statusbar
|
|
# by the resize widget.
|
|
self.status_bar.set_label('_padding1', ' ', side=RIGHT)
|
|
self.status_bar.set_label('column', 'Col: ?', side=RIGHT)
|
|
self.status_bar.set_label('line', 'Ln: ?', side=RIGHT)
|
|
self.status_bar.pack(side=BOTTOM, fill=X)
|
|
self.text.bind("<<set-line-and-column>>", self.set_line_and_column)
|
|
self.text.event_add("<<set-line-and-column>>",
|
|
"<KeyRelease>", "<ButtonRelease>")
|
|
self.text.after_idle(self.set_line_and_column)
|
|
|
|
def set_line_and_column(self, event=None):
|
|
line, column = self.text.index(INSERT).split('.')
|
|
self.status_bar.set_label('column', 'Col: %s' % column)
|
|
self.status_bar.set_label('line', 'Ln: %s' % line)
|
|
|
|
menu_specs = [
|
|
("file", "_File"),
|
|
("edit", "_Edit"),
|
|
("format", "F_ormat"),
|
|
("run", "_Run"),
|
|
("options", "_Options"),
|
|
("windows", "_Windows"),
|
|
("help", "_Help"),
|
|
]
|
|
|
|
if macosxSupport.runningAsOSXApp():
|
|
del menu_specs[-3]
|
|
menu_specs[-2] = ("windows", "_Window")
|
|
|
|
|
|
def createmenubar(self):
|
|
mbar = self.menubar
|
|
self.menudict = menudict = {}
|
|
for name, label in self.menu_specs:
|
|
underline, label = prepstr(label)
|
|
menudict[name] = menu = Menu(mbar, name=name)
|
|
mbar.add_cascade(label=label, menu=menu, underline=underline)
|
|
if sys.platform == 'darwin' and '.framework' in sys.executable:
|
|
# Insert the application menu
|
|
menudict['application'] = menu = Menu(mbar, name='apple')
|
|
mbar.add_cascade(label='IDLE', menu=menu)
|
|
self.fill_menus()
|
|
self.recent_files_menu = Menu(self.menubar)
|
|
self.menudict['file'].insert_cascade(3, label='Recent Files',
|
|
underline=0,
|
|
menu=self.recent_files_menu)
|
|
self.base_helpmenu_length = self.menudict['help'].index(END)
|
|
self.reset_help_menu_entries()
|
|
|
|
def postwindowsmenu(self):
|
|
# Only called when Windows menu exists
|
|
menu = self.menudict['windows']
|
|
end = menu.index("end")
|
|
if end is None:
|
|
end = -1
|
|
if end > self.wmenu_end:
|
|
menu.delete(self.wmenu_end+1, end)
|
|
WindowList.add_windows_to_menu(menu)
|
|
|
|
rmenu = None
|
|
|
|
def right_menu_event(self, event):
|
|
self.text.tag_remove("sel", "1.0", "end")
|
|
self.text.mark_set("insert", "@%d,%d" % (event.x, event.y))
|
|
if not self.rmenu:
|
|
self.make_rmenu()
|
|
rmenu = self.rmenu
|
|
self.event = event
|
|
iswin = sys.platform[:3] == 'win'
|
|
if iswin:
|
|
self.text.config(cursor="arrow")
|
|
rmenu.tk_popup(event.x_root, event.y_root)
|
|
if iswin:
|
|
self.text.config(cursor="ibeam")
|
|
|
|
rmenu_specs = [
|
|
# ("Label", "<<virtual-event>>"), ...
|
|
("Close", "<<close-window>>"), # Example
|
|
]
|
|
|
|
def make_rmenu(self):
|
|
rmenu = Menu(self.text, tearoff=0)
|
|
for label, eventname in self.rmenu_specs:
|
|
def command(text=self.text, eventname=eventname):
|
|
text.event_generate(eventname)
|
|
rmenu.add_command(label=label, command=command)
|
|
self.rmenu = rmenu
|
|
|
|
def about_dialog(self, event=None):
|
|
aboutDialog.AboutDialog(self.top,'About IDLE')
|
|
|
|
def config_dialog(self, event=None):
|
|
configDialog.ConfigDialog(self.top,'Settings')
|
|
|
|
def help_dialog(self, event=None):
|
|
fn=os.path.join(os.path.abspath(os.path.dirname(__file__)),'help.txt')
|
|
textView.view_file(self.top,'Help',fn)
|
|
|
|
def python_docs(self, event=None):
|
|
if sys.platform[:3] == 'win':
|
|
os.startfile(self.help_url)
|
|
else:
|
|
webbrowser.open(self.help_url)
|
|
return "break"
|
|
|
|
def cut(self,event):
|
|
self.text.event_generate("<<Cut>>")
|
|
return "break"
|
|
|
|
def copy(self,event):
|
|
if not self.text.tag_ranges("sel"):
|
|
# There is no selection, so do nothing and maybe interrupt.
|
|
return
|
|
self.text.event_generate("<<Copy>>")
|
|
return "break"
|
|
|
|
def paste(self,event):
|
|
self.text.event_generate("<<Paste>>")
|
|
self.text.see("insert")
|
|
return "break"
|
|
|
|
def select_all(self, event=None):
|
|
self.text.tag_add("sel", "1.0", "end-1c")
|
|
self.text.mark_set("insert", "1.0")
|
|
self.text.see("insert")
|
|
return "break"
|
|
|
|
def remove_selection(self, event=None):
|
|
self.text.tag_remove("sel", "1.0", "end")
|
|
self.text.see("insert")
|
|
|
|
def move_at_edge_if_selection(self, edge_index):
|
|
"""Cursor move begins at start or end of selection
|
|
|
|
When a left/right cursor key is pressed create and return to Tkinter a
|
|
function which causes a cursor move from the associated edge of the
|
|
selection.
|
|
|
|
"""
|
|
self_text_index = self.text.index
|
|
self_text_mark_set = self.text.mark_set
|
|
edges_table = ("sel.first+1c", "sel.last-1c")
|
|
def move_at_edge(event):
|
|
if (event.state & 5) == 0: # no shift(==1) or control(==4) pressed
|
|
try:
|
|
self_text_index("sel.first")
|
|
self_text_mark_set("insert", edges_table[edge_index])
|
|
except TclError:
|
|
pass
|
|
return move_at_edge
|
|
|
|
def del_word_left(self, event):
|
|
self.text.event_generate('<Meta-Delete>')
|
|
return "break"
|
|
|
|
def del_word_right(self, event):
|
|
self.text.event_generate('<Meta-d>')
|
|
return "break"
|
|
|
|
def find_event(self, event):
|
|
SearchDialog.find(self.text)
|
|
return "break"
|
|
|
|
def find_again_event(self, event):
|
|
SearchDialog.find_again(self.text)
|
|
return "break"
|
|
|
|
def find_selection_event(self, event):
|
|
SearchDialog.find_selection(self.text)
|
|
return "break"
|
|
|
|
def find_in_files_event(self, event):
|
|
GrepDialog.grep(self.text, self.io, self.flist)
|
|
return "break"
|
|
|
|
def replace_event(self, event):
|
|
ReplaceDialog.replace(self.text)
|
|
return "break"
|
|
|
|
def goto_line_event(self, event):
|
|
text = self.text
|
|
lineno = tkSimpleDialog.askinteger("Goto",
|
|
"Go to line number:",parent=text)
|
|
if lineno is None:
|
|
return "break"
|
|
if lineno <= 0:
|
|
text.bell()
|
|
return "break"
|
|
text.mark_set("insert", "%d.0" % lineno)
|
|
text.see("insert")
|
|
|
|
def open_module(self, event=None):
|
|
# XXX Shouldn't this be in IOBinding?
|
|
try:
|
|
name = self.text.get("sel.first", "sel.last")
|
|
except TclError:
|
|
name = ""
|
|
else:
|
|
name = name.strip()
|
|
name = tkSimpleDialog.askstring("Module",
|
|
"Enter the name of a Python module\n"
|
|
"to search on sys.path and open:",
|
|
parent=self.text, initialvalue=name)
|
|
if name:
|
|
name = name.strip()
|
|
if not name:
|
|
return
|
|
# XXX Ought to insert current file's directory in front of path
|
|
try:
|
|
(f, file, (suffix, mode, type)) = _find_module(name)
|
|
except (NameError, ImportError) as msg:
|
|
tkMessageBox.showerror("Import error", str(msg), parent=self.text)
|
|
return
|
|
if type != imp.PY_SOURCE:
|
|
tkMessageBox.showerror("Unsupported type",
|
|
"%s is not a source module" % name, parent=self.text)
|
|
return
|
|
if f:
|
|
f.close()
|
|
if self.flist:
|
|
self.flist.open(file)
|
|
else:
|
|
self.io.loadfile(file)
|
|
|
|
def open_class_browser(self, event=None):
|
|
filename = self.io.filename
|
|
if not filename:
|
|
tkMessageBox.showerror(
|
|
"No filename",
|
|
"This buffer has no associated filename",
|
|
master=self.text)
|
|
self.text.focus_set()
|
|
return None
|
|
head, tail = os.path.split(filename)
|
|
base, ext = os.path.splitext(tail)
|
|
from idlelib import ClassBrowser
|
|
ClassBrowser.ClassBrowser(self.flist, base, [head])
|
|
|
|
def open_path_browser(self, event=None):
|
|
from idlelib import PathBrowser
|
|
PathBrowser.PathBrowser(self.flist)
|
|
|
|
def gotoline(self, lineno):
|
|
if lineno is not None and lineno > 0:
|
|
self.text.mark_set("insert", "%d.0" % lineno)
|
|
self.text.tag_remove("sel", "1.0", "end")
|
|
self.text.tag_add("sel", "insert", "insert +1l")
|
|
self.center()
|
|
|
|
def ispythonsource(self, filename):
|
|
if not filename or os.path.isdir(filename):
|
|
return True
|
|
base, ext = os.path.splitext(os.path.basename(filename))
|
|
if os.path.normcase(ext) in (".py", ".pyw"):
|
|
return True
|
|
line = self.text.get('1.0', '1.0 lineend')
|
|
return line.startswith('#!') and 'python' in line
|
|
|
|
def close_hook(self):
|
|
if self.flist:
|
|
self.flist.unregister_maybe_terminate(self)
|
|
self.flist = None
|
|
|
|
def set_close_hook(self, close_hook):
|
|
self.close_hook = close_hook
|
|
|
|
def filename_change_hook(self):
|
|
if self.flist:
|
|
self.flist.filename_changed_edit(self)
|
|
self.saved_change_hook()
|
|
self.top.update_windowlist_registry(self)
|
|
if self.ispythonsource(self.io.filename):
|
|
self.addcolorizer()
|
|
else:
|
|
self.rmcolorizer()
|
|
|
|
def addcolorizer(self):
|
|
if self.color:
|
|
return
|
|
self.per.removefilter(self.undo)
|
|
self.color = self.ColorDelegator()
|
|
self.per.insertfilter(self.color)
|
|
self.per.insertfilter(self.undo)
|
|
|
|
def rmcolorizer(self):
|
|
if not self.color:
|
|
return
|
|
self.color.removecolors()
|
|
self.per.removefilter(self.undo)
|
|
self.per.removefilter(self.color)
|
|
self.color = None
|
|
self.per.insertfilter(self.undo)
|
|
|
|
def ResetColorizer(self):
|
|
"Update the colour theme if it is changed"
|
|
# Called from configDialog.py
|
|
if self.color:
|
|
self.color = self.ColorDelegator()
|
|
self.per.insertfilter(self.color)
|
|
theme = idleConf.GetOption('main','Theme','name')
|
|
self.text.config(idleConf.GetHighlight(theme, "normal"))
|
|
|
|
IDENTCHARS = string.ascii_letters + string.digits + "_"
|
|
|
|
def colorize_syntax_error(self, text, pos):
|
|
text.tag_add("ERROR", pos)
|
|
char = text.get(pos)
|
|
if char and char in self.IDENTCHARS:
|
|
text.tag_add("ERROR", pos + " wordstart", pos)
|
|
if '\n' == text.get(pos): # error at line end
|
|
text.mark_set("insert", pos)
|
|
else:
|
|
text.mark_set("insert", pos + "+1c")
|
|
text.see(pos)
|
|
|
|
def ResetFont(self):
|
|
"Update the text widgets' font if it is changed"
|
|
# Called from configDialog.py
|
|
fontWeight='normal'
|
|
if idleConf.GetOption('main','EditorWindow','font-bold',type='bool'):
|
|
fontWeight='bold'
|
|
self.text.config(font=(idleConf.GetOption('main','EditorWindow','font'),
|
|
idleConf.GetOption('main','EditorWindow','font-size'),
|
|
fontWeight))
|
|
|
|
def RemoveKeybindings(self):
|
|
"Remove the keybindings before they are changed."
|
|
# Called from configDialog.py
|
|
self.Bindings.default_keydefs = keydefs = idleConf.GetCurrentKeySet()
|
|
for event, keylist in keydefs.items():
|
|
self.text.event_delete(event, *keylist)
|
|
for extensionName in self.get_standard_extension_names():
|
|
xkeydefs = idleConf.GetExtensionBindings(extensionName)
|
|
if xkeydefs:
|
|
for event, keylist in xkeydefs.items():
|
|
self.text.event_delete(event, *keylist)
|
|
|
|
def ApplyKeybindings(self):
|
|
"Update the keybindings after they are changed"
|
|
# Called from configDialog.py
|
|
self.Bindings.default_keydefs = keydefs = idleConf.GetCurrentKeySet()
|
|
self.apply_bindings()
|
|
for extensionName in self.get_standard_extension_names():
|
|
xkeydefs = idleConf.GetExtensionBindings(extensionName)
|
|
if xkeydefs:
|
|
self.apply_bindings(xkeydefs)
|
|
#update menu accelerators
|
|
menuEventDict = {}
|
|
for menu in self.Bindings.menudefs:
|
|
menuEventDict[menu[0]] = {}
|
|
for item in menu[1]:
|
|
if item:
|
|
menuEventDict[menu[0]][prepstr(item[0])[1]] = item[1]
|
|
for menubarItem in self.menudict:
|
|
menu = self.menudict[menubarItem]
|
|
end = menu.index(END) + 1
|
|
for index in range(0, end):
|
|
if menu.type(index) == 'command':
|
|
accel = menu.entrycget(index, 'accelerator')
|
|
if accel:
|
|
itemName = menu.entrycget(index, 'label')
|
|
event = ''
|
|
if menubarItem in menuEventDict:
|
|
if itemName in menuEventDict[menubarItem]:
|
|
event = menuEventDict[menubarItem][itemName]
|
|
if event:
|
|
accel = get_accelerator(keydefs, event)
|
|
menu.entryconfig(index, accelerator=accel)
|
|
|
|
def set_notabs_indentwidth(self):
|
|
"Update the indentwidth if changed and not using tabs in this window"
|
|
# Called from configDialog.py
|
|
if not self.usetabs:
|
|
self.indentwidth = idleConf.GetOption('main', 'Indent','num-spaces',
|
|
type='int')
|
|
|
|
def reset_help_menu_entries(self):
|
|
"Update the additional help entries on the Help menu"
|
|
help_list = idleConf.GetAllExtraHelpSourcesList()
|
|
helpmenu = self.menudict['help']
|
|
# first delete the extra help entries, if any
|
|
helpmenu_length = helpmenu.index(END)
|
|
if helpmenu_length > self.base_helpmenu_length:
|
|
helpmenu.delete((self.base_helpmenu_length + 1), helpmenu_length)
|
|
# then rebuild them
|
|
if help_list:
|
|
helpmenu.add_separator()
|
|
for entry in help_list:
|
|
cmd = self.__extra_help_callback(entry[1])
|
|
helpmenu.add_command(label=entry[0], command=cmd)
|
|
# and update the menu dictionary
|
|
self.menudict['help'] = helpmenu
|
|
|
|
def __extra_help_callback(self, helpfile):
|
|
"Create a callback with the helpfile value frozen at definition time"
|
|
def display_extra_help(helpfile=helpfile):
|
|
if not helpfile.startswith(('www', 'http')):
|
|
url = os.path.normpath(helpfile)
|
|
if sys.platform[:3] == 'win':
|
|
os.startfile(helpfile)
|
|
else:
|
|
webbrowser.open(helpfile)
|
|
return display_extra_help
|
|
|
|
def update_recent_files_list(self, new_file=None):
|
|
"Load and update the recent files list and menus"
|
|
rf_list = []
|
|
if os.path.exists(self.recent_files_path):
|
|
rf_list_file = open(self.recent_files_path,'r')
|
|
try:
|
|
rf_list = rf_list_file.readlines()
|
|
finally:
|
|
rf_list_file.close()
|
|
if new_file:
|
|
new_file = os.path.abspath(new_file) + '\n'
|
|
if new_file in rf_list:
|
|
rf_list.remove(new_file) # move to top
|
|
rf_list.insert(0, new_file)
|
|
# clean and save the recent files list
|
|
bad_paths = []
|
|
for path in rf_list:
|
|
if '\0' in path or not os.path.exists(path[0:-1]):
|
|
bad_paths.append(path)
|
|
rf_list = [path for path in rf_list if path not in bad_paths]
|
|
ulchars = "1234567890ABCDEFGHIJK"
|
|
rf_list = rf_list[0:len(ulchars)]
|
|
rf_file = open(self.recent_files_path, 'w')
|
|
try:
|
|
rf_file.writelines(rf_list)
|
|
finally:
|
|
rf_file.close()
|
|
# for each edit window instance, construct the recent files menu
|
|
for instance in self.top.instance_dict:
|
|
menu = instance.recent_files_menu
|
|
menu.delete(1, END) # clear, and rebuild:
|
|
for i, file in zip(count(), rf_list):
|
|
file_name = file[0:-1] # zap \n
|
|
# make unicode string to display non-ASCII chars correctly
|
|
ufile_name = self._filename_to_unicode(file_name)
|
|
callback = instance.__recent_file_callback(file_name)
|
|
menu.add_command(label=ulchars[i] + " " + ufile_name,
|
|
command=callback,
|
|
underline=0)
|
|
|
|
def __recent_file_callback(self, file_name):
|
|
def open_recent_file(fn_closure=file_name):
|
|
self.io.open(editFile=fn_closure)
|
|
return open_recent_file
|
|
|
|
def saved_change_hook(self):
|
|
short = self.short_title()
|
|
long = self.long_title()
|
|
if short and long:
|
|
title = short + " - " + long
|
|
elif short:
|
|
title = short
|
|
elif long:
|
|
title = long
|
|
else:
|
|
title = "Untitled"
|
|
icon = short or long or title
|
|
if not self.get_saved():
|
|
title = "*%s*" % title
|
|
icon = "*%s" % icon
|
|
self.top.wm_title(title)
|
|
self.top.wm_iconname(icon)
|
|
|
|
def get_saved(self):
|
|
return self.undo.get_saved()
|
|
|
|
def set_saved(self, flag):
|
|
self.undo.set_saved(flag)
|
|
|
|
def reset_undo(self):
|
|
self.undo.reset_undo()
|
|
|
|
def short_title(self):
|
|
filename = self.io.filename
|
|
if filename:
|
|
filename = os.path.basename(filename)
|
|
# return unicode string to display non-ASCII chars correctly
|
|
return self._filename_to_unicode(filename)
|
|
|
|
def long_title(self):
|
|
# return unicode string to display non-ASCII chars correctly
|
|
return self._filename_to_unicode(self.io.filename or "")
|
|
|
|
def center_insert_event(self, event):
|
|
self.center()
|
|
|
|
def center(self, mark="insert"):
|
|
text = self.text
|
|
top, bot = self.getwindowlines()
|
|
lineno = self.getlineno(mark)
|
|
height = bot - top
|
|
newtop = max(1, lineno - height//2)
|
|
text.yview(float(newtop))
|
|
|
|
def getwindowlines(self):
|
|
text = self.text
|
|
top = self.getlineno("@0,0")
|
|
bot = self.getlineno("@0,65535")
|
|
if top == bot and text.winfo_height() == 1:
|
|
# Geometry manager hasn't run yet
|
|
height = int(text['height'])
|
|
bot = top + height - 1
|
|
return top, bot
|
|
|
|
def getlineno(self, mark="insert"):
|
|
text = self.text
|
|
return int(float(text.index(mark)))
|
|
|
|
def get_geometry(self):
|
|
"Return (width, height, x, y)"
|
|
geom = self.top.wm_geometry()
|
|
m = re.match(r"(\d+)x(\d+)\+(-?\d+)\+(-?\d+)", geom)
|
|
return list(map(int, m.groups()))
|
|
|
|
def close_event(self, event):
|
|
self.close()
|
|
|
|
def maybesave(self):
|
|
if self.io:
|
|
if not self.get_saved():
|
|
if self.top.state()!='normal':
|
|
self.top.deiconify()
|
|
self.top.lower()
|
|
self.top.lift()
|
|
return self.io.maybesave()
|
|
|
|
def close(self):
|
|
reply = self.maybesave()
|
|
if str(reply) != "cancel":
|
|
self._close()
|
|
return reply
|
|
|
|
def _close(self):
|
|
if self.io.filename:
|
|
self.update_recent_files_list(new_file=self.io.filename)
|
|
WindowList.unregister_callback(self.postwindowsmenu)
|
|
self.unload_extensions()
|
|
self.io.close()
|
|
self.io = None
|
|
self.undo = None
|
|
if self.color:
|
|
self.color.close(False)
|
|
self.color = None
|
|
self.text = None
|
|
self.tkinter_vars = None
|
|
self.per.close()
|
|
self.per = None
|
|
self.top.destroy()
|
|
if self.close_hook:
|
|
# unless override: unregister from flist, terminate if last window
|
|
self.close_hook()
|
|
|
|
def load_extensions(self):
|
|
self.extensions = {}
|
|
self.load_standard_extensions()
|
|
|
|
def unload_extensions(self):
|
|
for ins in list(self.extensions.values()):
|
|
if hasattr(ins, "close"):
|
|
ins.close()
|
|
self.extensions = {}
|
|
|
|
def load_standard_extensions(self):
|
|
for name in self.get_standard_extension_names():
|
|
try:
|
|
self.load_extension(name)
|
|
except:
|
|
print("Failed to load extension", repr(name))
|
|
traceback.print_exc()
|
|
|
|
def get_standard_extension_names(self):
|
|
return idleConf.GetExtensions(editor_only=True)
|
|
|
|
def load_extension(self, name):
|
|
try:
|
|
mod = __import__(name, globals(), locals(), [])
|
|
except ImportError:
|
|
print("\nFailed to import extension: ", name)
|
|
raise
|
|
cls = getattr(mod, name)
|
|
keydefs = idleConf.GetExtensionBindings(name)
|
|
if hasattr(cls, "menudefs"):
|
|
self.fill_menus(cls.menudefs, keydefs)
|
|
ins = cls(self)
|
|
self.extensions[name] = ins
|
|
if keydefs:
|
|
self.apply_bindings(keydefs)
|
|
for vevent in keydefs:
|
|
methodname = vevent.replace("-", "_")
|
|
while methodname[:1] == '<':
|
|
methodname = methodname[1:]
|
|
while methodname[-1:] == '>':
|
|
methodname = methodname[:-1]
|
|
methodname = methodname + "_event"
|
|
if hasattr(ins, methodname):
|
|
self.text.bind(vevent, getattr(ins, methodname))
|
|
|
|
def apply_bindings(self, keydefs=None):
|
|
if keydefs is None:
|
|
keydefs = self.Bindings.default_keydefs
|
|
text = self.text
|
|
text.keydefs = keydefs
|
|
for event, keylist in keydefs.items():
|
|
if keylist:
|
|
text.event_add(event, *keylist)
|
|
|
|
def fill_menus(self, menudefs=None, keydefs=None):
|
|
"""Add appropriate entries to the menus and submenus
|
|
|
|
Menus that are absent or None in self.menudict are ignored.
|
|
"""
|
|
if menudefs is None:
|
|
menudefs = self.Bindings.menudefs
|
|
if keydefs is None:
|
|
keydefs = self.Bindings.default_keydefs
|
|
menudict = self.menudict
|
|
text = self.text
|
|
for mname, entrylist in menudefs:
|
|
menu = menudict.get(mname)
|
|
if not menu:
|
|
continue
|
|
for entry in entrylist:
|
|
if not entry:
|
|
menu.add_separator()
|
|
else:
|
|
label, eventname = entry
|
|
checkbutton = (label[:1] == '!')
|
|
if checkbutton:
|
|
label = label[1:]
|
|
underline, label = prepstr(label)
|
|
accelerator = get_accelerator(keydefs, eventname)
|
|
def command(text=text, eventname=eventname):
|
|
text.event_generate(eventname)
|
|
if checkbutton:
|
|
var = self.get_var_obj(eventname, BooleanVar)
|
|
menu.add_checkbutton(label=label, underline=underline,
|
|
command=command, accelerator=accelerator,
|
|
variable=var)
|
|
else:
|
|
menu.add_command(label=label, underline=underline,
|
|
command=command,
|
|
accelerator=accelerator)
|
|
|
|
def getvar(self, name):
|
|
var = self.get_var_obj(name)
|
|
if var:
|
|
value = var.get()
|
|
return value
|
|
else:
|
|
raise NameError(name)
|
|
|
|
def setvar(self, name, value, vartype=None):
|
|
var = self.get_var_obj(name, vartype)
|
|
if var:
|
|
var.set(value)
|
|
else:
|
|
raise NameError(name)
|
|
|
|
def get_var_obj(self, name, vartype=None):
|
|
var = self.tkinter_vars.get(name)
|
|
if not var and vartype:
|
|
# create a Tkinter variable object with self.text as master:
|
|
self.tkinter_vars[name] = var = vartype(self.text)
|
|
return var
|
|
|
|
# Tk implementations of "virtual text methods" -- each platform
|
|
# reusing IDLE's support code needs to define these for its GUI's
|
|
# flavor of widget.
|
|
|
|
# Is character at text_index in a Python string? Return 0 for
|
|
# "guaranteed no", true for anything else. This info is expensive
|
|
# to compute ab initio, but is probably already known by the
|
|
# platform's colorizer.
|
|
|
|
def is_char_in_string(self, text_index):
|
|
if self.color:
|
|
# Return true iff colorizer hasn't (re)gotten this far
|
|
# yet, or the character is tagged as being in a string
|
|
return self.text.tag_prevrange("TODO", text_index) or \
|
|
"STRING" in self.text.tag_names(text_index)
|
|
else:
|
|
# The colorizer is missing: assume the worst
|
|
return 1
|
|
|
|
# If a selection is defined in the text widget, return (start,
|
|
# end) as Tkinter text indices, otherwise return (None, None)
|
|
def get_selection_indices(self):
|
|
try:
|
|
first = self.text.index("sel.first")
|
|
last = self.text.index("sel.last")
|
|
return first, last
|
|
except TclError:
|
|
return None, None
|
|
|
|
# Return the text widget's current view of what a tab stop means
|
|
# (equivalent width in spaces).
|
|
|
|
def get_tk_tabwidth(self):
|
|
current = self.text['tabs'] or TK_TABWIDTH_DEFAULT
|
|
return int(current)
|
|
|
|
# Set the text widget's current view of what a tab stop means.
|
|
|
|
def set_tk_tabwidth(self, newtabwidth):
|
|
text = self.text
|
|
if self.get_tk_tabwidth() != newtabwidth:
|
|
# Set text widget tab width
|
|
pixels = text.tk.call("font", "measure", text["font"],
|
|
"-displayof", text.master,
|
|
"n" * newtabwidth)
|
|
text.configure(tabs=pixels)
|
|
|
|
### begin autoindent code ### (configuration was moved to beginning of class)
|
|
|
|
def set_indentation_params(self, is_py_src, guess=True):
|
|
if is_py_src and guess:
|
|
i = self.guess_indent()
|
|
if 2 <= i <= 8:
|
|
self.indentwidth = i
|
|
if self.indentwidth != self.tabwidth:
|
|
self.usetabs = False
|
|
self.set_tk_tabwidth(self.tabwidth)
|
|
|
|
def smart_backspace_event(self, event):
|
|
text = self.text
|
|
first, last = self.get_selection_indices()
|
|
if first and last:
|
|
text.delete(first, last)
|
|
text.mark_set("insert", first)
|
|
return "break"
|
|
# Delete whitespace left, until hitting a real char or closest
|
|
# preceding virtual tab stop.
|
|
chars = text.get("insert linestart", "insert")
|
|
if chars == '':
|
|
if text.compare("insert", ">", "1.0"):
|
|
# easy: delete preceding newline
|
|
text.delete("insert-1c")
|
|
else:
|
|
text.bell() # at start of buffer
|
|
return "break"
|
|
if chars[-1] not in " \t":
|
|
# easy: delete preceding real char
|
|
text.delete("insert-1c")
|
|
return "break"
|
|
# Ick. It may require *inserting* spaces if we back up over a
|
|
# tab character! This is written to be clear, not fast.
|
|
tabwidth = self.tabwidth
|
|
have = len(chars.expandtabs(tabwidth))
|
|
assert have > 0
|
|
want = ((have - 1) // self.indentwidth) * self.indentwidth
|
|
# Debug prompt is multilined....
|
|
last_line_of_prompt = sys.ps1.split('\n')[-1]
|
|
ncharsdeleted = 0
|
|
while 1:
|
|
if chars == last_line_of_prompt:
|
|
break
|
|
chars = chars[:-1]
|
|
ncharsdeleted = ncharsdeleted + 1
|
|
have = len(chars.expandtabs(tabwidth))
|
|
if have <= want or chars[-1] not in " \t":
|
|
break
|
|
text.undo_block_start()
|
|
text.delete("insert-%dc" % ncharsdeleted, "insert")
|
|
if have < want:
|
|
text.insert("insert", ' ' * (want - have))
|
|
text.undo_block_stop()
|
|
return "break"
|
|
|
|
def smart_indent_event(self, event):
|
|
# if intraline selection:
|
|
# delete it
|
|
# elif multiline selection:
|
|
# do indent-region
|
|
# else:
|
|
# indent one level
|
|
text = self.text
|
|
first, last = self.get_selection_indices()
|
|
text.undo_block_start()
|
|
try:
|
|
if first and last:
|
|
if index2line(first) != index2line(last):
|
|
return self.indent_region_event(event)
|
|
text.delete(first, last)
|
|
text.mark_set("insert", first)
|
|
prefix = text.get("insert linestart", "insert")
|
|
raw, effective = classifyws(prefix, self.tabwidth)
|
|
if raw == len(prefix):
|
|
# only whitespace to the left
|
|
self.reindent_to(effective + self.indentwidth)
|
|
else:
|
|
# tab to the next 'stop' within or to right of line's text:
|
|
if self.usetabs:
|
|
pad = '\t'
|
|
else:
|
|
effective = len(prefix.expandtabs(self.tabwidth))
|
|
n = self.indentwidth
|
|
pad = ' ' * (n - effective % n)
|
|
text.insert("insert", pad)
|
|
text.see("insert")
|
|
return "break"
|
|
finally:
|
|
text.undo_block_stop()
|
|
|
|
def newline_and_indent_event(self, event):
|
|
text = self.text
|
|
first, last = self.get_selection_indices()
|
|
text.undo_block_start()
|
|
try:
|
|
if first and last:
|
|
text.delete(first, last)
|
|
text.mark_set("insert", first)
|
|
line = text.get("insert linestart", "insert")
|
|
i, n = 0, len(line)
|
|
while i < n and line[i] in " \t":
|
|
i = i+1
|
|
if i == n:
|
|
# the cursor is in or at leading indentation in a continuation
|
|
# line; just inject an empty line at the start
|
|
text.insert("insert linestart", '\n')
|
|
return "break"
|
|
indent = line[:i]
|
|
# strip whitespace before insert point unless it's in the prompt
|
|
i = 0
|
|
last_line_of_prompt = sys.ps1.split('\n')[-1]
|
|
while line and line[-1] in " \t" and line != last_line_of_prompt:
|
|
line = line[:-1]
|
|
i = i+1
|
|
if i:
|
|
text.delete("insert - %d chars" % i, "insert")
|
|
# strip whitespace after insert point
|
|
while text.get("insert") in " \t":
|
|
text.delete("insert")
|
|
# start new line
|
|
text.insert("insert", '\n')
|
|
|
|
# adjust indentation for continuations and block
|
|
# open/close first need to find the last stmt
|
|
lno = index2line(text.index('insert'))
|
|
y = PyParse.Parser(self.indentwidth, self.tabwidth)
|
|
if not self.context_use_ps1:
|
|
for context in self.num_context_lines:
|
|
startat = max(lno - context, 1)
|
|
startatindex = repr(startat) + ".0"
|
|
rawtext = text.get(startatindex, "insert")
|
|
y.set_str(rawtext)
|
|
bod = y.find_good_parse_start(
|
|
self.context_use_ps1,
|
|
self._build_char_in_string_func(startatindex))
|
|
if bod is not None or startat == 1:
|
|
break
|
|
y.set_lo(bod or 0)
|
|
else:
|
|
r = text.tag_prevrange("console", "insert")
|
|
if r:
|
|
startatindex = r[1]
|
|
else:
|
|
startatindex = "1.0"
|
|
rawtext = text.get(startatindex, "insert")
|
|
y.set_str(rawtext)
|
|
y.set_lo(0)
|
|
|
|
c = y.get_continuation_type()
|
|
if c != PyParse.C_NONE:
|
|
# The current stmt hasn't ended yet.
|
|
if c == PyParse.C_STRING_FIRST_LINE:
|
|
# after the first line of a string; do not indent at all
|
|
pass
|
|
elif c == PyParse.C_STRING_NEXT_LINES:
|
|
# inside a string which started before this line;
|
|
# just mimic the current indent
|
|
text.insert("insert", indent)
|
|
elif c == PyParse.C_BRACKET:
|
|
# line up with the first (if any) element of the
|
|
# last open bracket structure; else indent one
|
|
# level beyond the indent of the line with the
|
|
# last open bracket
|
|
self.reindent_to(y.compute_bracket_indent())
|
|
elif c == PyParse.C_BACKSLASH:
|
|
# if more than one line in this stmt already, just
|
|
# mimic the current indent; else if initial line
|
|
# has a start on an assignment stmt, indent to
|
|
# beyond leftmost =; else to beyond first chunk of
|
|
# non-whitespace on initial line
|
|
if y.get_num_lines_in_stmt() > 1:
|
|
text.insert("insert", indent)
|
|
else:
|
|
self.reindent_to(y.compute_backslash_indent())
|
|
else:
|
|
assert 0, "bogus continuation type %r" % (c,)
|
|
return "break"
|
|
|
|
# This line starts a brand new stmt; indent relative to
|
|
# indentation of initial line of closest preceding
|
|
# interesting stmt.
|
|
indent = y.get_base_indent_string()
|
|
text.insert("insert", indent)
|
|
if y.is_block_opener():
|
|
self.smart_indent_event(event)
|
|
elif indent and y.is_block_closer():
|
|
self.smart_backspace_event(event)
|
|
return "break"
|
|
finally:
|
|
text.see("insert")
|
|
text.undo_block_stop()
|
|
|
|
# Our editwin provides a is_char_in_string function that works
|
|
# with a Tk text index, but PyParse only knows about offsets into
|
|
# a string. This builds a function for PyParse that accepts an
|
|
# offset.
|
|
|
|
def _build_char_in_string_func(self, startindex):
|
|
def inner(offset, _startindex=startindex,
|
|
_icis=self.is_char_in_string):
|
|
return _icis(_startindex + "+%dc" % offset)
|
|
return inner
|
|
|
|
def indent_region_event(self, event):
|
|
head, tail, chars, lines = self.get_region()
|
|
for pos in range(len(lines)):
|
|
line = lines[pos]
|
|
if line:
|
|
raw, effective = classifyws(line, self.tabwidth)
|
|
effective = effective + self.indentwidth
|
|
lines[pos] = self._make_blanks(effective) + line[raw:]
|
|
self.set_region(head, tail, chars, lines)
|
|
return "break"
|
|
|
|
def dedent_region_event(self, event):
|
|
head, tail, chars, lines = self.get_region()
|
|
for pos in range(len(lines)):
|
|
line = lines[pos]
|
|
if line:
|
|
raw, effective = classifyws(line, self.tabwidth)
|
|
effective = max(effective - self.indentwidth, 0)
|
|
lines[pos] = self._make_blanks(effective) + line[raw:]
|
|
self.set_region(head, tail, chars, lines)
|
|
return "break"
|
|
|
|
def comment_region_event(self, event):
|
|
head, tail, chars, lines = self.get_region()
|
|
for pos in range(len(lines) - 1):
|
|
line = lines[pos]
|
|
lines[pos] = '##' + line
|
|
self.set_region(head, tail, chars, lines)
|
|
|
|
def uncomment_region_event(self, event):
|
|
head, tail, chars, lines = self.get_region()
|
|
for pos in range(len(lines)):
|
|
line = lines[pos]
|
|
if not line:
|
|
continue
|
|
if line[:2] == '##':
|
|
line = line[2:]
|
|
elif line[:1] == '#':
|
|
line = line[1:]
|
|
lines[pos] = line
|
|
self.set_region(head, tail, chars, lines)
|
|
|
|
def tabify_region_event(self, event):
|
|
head, tail, chars, lines = self.get_region()
|
|
tabwidth = self._asktabwidth()
|
|
for pos in range(len(lines)):
|
|
line = lines[pos]
|
|
if line:
|
|
raw, effective = classifyws(line, tabwidth)
|
|
ntabs, nspaces = divmod(effective, tabwidth)
|
|
lines[pos] = '\t' * ntabs + ' ' * nspaces + line[raw:]
|
|
self.set_region(head, tail, chars, lines)
|
|
|
|
def untabify_region_event(self, event):
|
|
head, tail, chars, lines = self.get_region()
|
|
tabwidth = self._asktabwidth()
|
|
for pos in range(len(lines)):
|
|
lines[pos] = lines[pos].expandtabs(tabwidth)
|
|
self.set_region(head, tail, chars, lines)
|
|
|
|
def toggle_tabs_event(self, event):
|
|
if self.askyesno(
|
|
"Toggle tabs",
|
|
"Turn tabs " + ("on", "off")[self.usetabs] +
|
|
"?\nIndent width " +
|
|
("will be", "remains at")[self.usetabs] + " 8." +
|
|
"\n Note: a tab is always 8 columns",
|
|
parent=self.text):
|
|
self.usetabs = not self.usetabs
|
|
# Try to prevent inconsistent indentation.
|
|
# User must change indent width manually after using tabs.
|
|
self.indentwidth = 8
|
|
return "break"
|
|
|
|
# XXX this isn't bound to anything -- see tabwidth comments
|
|
## def change_tabwidth_event(self, event):
|
|
## new = self._asktabwidth()
|
|
## if new != self.tabwidth:
|
|
## self.tabwidth = new
|
|
## self.set_indentation_params(0, guess=0)
|
|
## return "break"
|
|
|
|
def change_indentwidth_event(self, event):
|
|
new = self.askinteger(
|
|
"Indent width",
|
|
"New indent width (2-16)\n(Always use 8 when using tabs)",
|
|
parent=self.text,
|
|
initialvalue=self.indentwidth,
|
|
minvalue=2,
|
|
maxvalue=16)
|
|
if new and new != self.indentwidth and not self.usetabs:
|
|
self.indentwidth = new
|
|
return "break"
|
|
|
|
def get_region(self):
|
|
text = self.text
|
|
first, last = self.get_selection_indices()
|
|
if first and last:
|
|
head = text.index(first + " linestart")
|
|
tail = text.index(last + "-1c lineend +1c")
|
|
else:
|
|
head = text.index("insert linestart")
|
|
tail = text.index("insert lineend +1c")
|
|
chars = text.get(head, tail)
|
|
lines = chars.split("\n")
|
|
return head, tail, chars, lines
|
|
|
|
def set_region(self, head, tail, chars, lines):
|
|
text = self.text
|
|
newchars = "\n".join(lines)
|
|
if newchars == chars:
|
|
text.bell()
|
|
return
|
|
text.tag_remove("sel", "1.0", "end")
|
|
text.mark_set("insert", head)
|
|
text.undo_block_start()
|
|
text.delete(head, tail)
|
|
text.insert(head, newchars)
|
|
text.undo_block_stop()
|
|
text.tag_add("sel", head, "insert")
|
|
|
|
# Make string that displays as n leading blanks.
|
|
|
|
def _make_blanks(self, n):
|
|
if self.usetabs:
|
|
ntabs, nspaces = divmod(n, self.tabwidth)
|
|
return '\t' * ntabs + ' ' * nspaces
|
|
else:
|
|
return ' ' * n
|
|
|
|
# Delete from beginning of line to insert point, then reinsert
|
|
# column logical (meaning use tabs if appropriate) spaces.
|
|
|
|
def reindent_to(self, column):
|
|
text = self.text
|
|
text.undo_block_start()
|
|
if text.compare("insert linestart", "!=", "insert"):
|
|
text.delete("insert linestart", "insert")
|
|
if column:
|
|
text.insert("insert", self._make_blanks(column))
|
|
text.undo_block_stop()
|
|
|
|
def _asktabwidth(self):
|
|
return self.askinteger(
|
|
"Tab width",
|
|
"Columns per tab? (2-16)",
|
|
parent=self.text,
|
|
initialvalue=self.indentwidth,
|
|
minvalue=2,
|
|
maxvalue=16) or self.tabwidth
|
|
|
|
# Guess indentwidth from text content.
|
|
# Return guessed indentwidth. This should not be believed unless
|
|
# it's in a reasonable range (e.g., it will be 0 if no indented
|
|
# blocks are found).
|
|
|
|
def guess_indent(self):
|
|
opener, indented = IndentSearcher(self.text, self.tabwidth).run()
|
|
if opener and indented:
|
|
raw, indentsmall = classifyws(opener, self.tabwidth)
|
|
raw, indentlarge = classifyws(indented, self.tabwidth)
|
|
else:
|
|
indentsmall = indentlarge = 0
|
|
return indentlarge - indentsmall
|
|
|
|
# "line.col" -> line, as an int
|
|
def index2line(index):
|
|
return int(float(index))
|
|
|
|
# Look at the leading whitespace in s.
|
|
# Return pair (# of leading ws characters,
|
|
# effective # of leading blanks after expanding
|
|
# tabs to width tabwidth)
|
|
|
|
def classifyws(s, tabwidth):
|
|
raw = effective = 0
|
|
for ch in s:
|
|
if ch == ' ':
|
|
raw = raw + 1
|
|
effective = effective + 1
|
|
elif ch == '\t':
|
|
raw = raw + 1
|
|
effective = (effective // tabwidth + 1) * tabwidth
|
|
else:
|
|
break
|
|
return raw, effective
|
|
|
|
import tokenize
|
|
_tokenize = tokenize
|
|
del tokenize
|
|
|
|
class IndentSearcher(object):
|
|
|
|
# .run() chews over the Text widget, looking for a block opener
|
|
# and the stmt following it. Returns a pair,
|
|
# (line containing block opener, line containing stmt)
|
|
# Either or both may be None.
|
|
|
|
def __init__(self, text, tabwidth):
|
|
self.text = text
|
|
self.tabwidth = tabwidth
|
|
self.i = self.finished = 0
|
|
self.blkopenline = self.indentedline = None
|
|
|
|
def readline(self):
|
|
if self.finished:
|
|
return ""
|
|
i = self.i = self.i + 1
|
|
mark = repr(i) + ".0"
|
|
if self.text.compare(mark, ">=", "end"):
|
|
return ""
|
|
return self.text.get(mark, mark + " lineend+1c")
|
|
|
|
def tokeneater(self, type, token, start, end, line,
|
|
INDENT=_tokenize.INDENT,
|
|
NAME=_tokenize.NAME,
|
|
OPENERS=('class', 'def', 'for', 'if', 'try', 'while')):
|
|
if self.finished:
|
|
pass
|
|
elif type == NAME and token in OPENERS:
|
|
self.blkopenline = line
|
|
elif type == INDENT and self.blkopenline:
|
|
self.indentedline = line
|
|
self.finished = 1
|
|
|
|
def run(self):
|
|
save_tabsize = _tokenize.tabsize
|
|
_tokenize.tabsize = self.tabwidth
|
|
try:
|
|
try:
|
|
_tokenize.tokenize(self.readline, self.tokeneater)
|
|
except _tokenize.TokenError:
|
|
# since we cut off the tokenizer early, we can trigger
|
|
# spurious errors
|
|
pass
|
|
finally:
|
|
_tokenize.tabsize = save_tabsize
|
|
return self.blkopenline, self.indentedline
|
|
|
|
### end autoindent code ###
|
|
|
|
def prepstr(s):
|
|
# Helper to extract the underscore from a string, e.g.
|
|
# prepstr("Co_py") returns (2, "Copy").
|
|
i = s.find('_')
|
|
if i >= 0:
|
|
s = s[:i] + s[i+1:]
|
|
return i, s
|
|
|
|
|
|
keynames = {
|
|
'bracketleft': '[',
|
|
'bracketright': ']',
|
|
'slash': '/',
|
|
}
|
|
|
|
def get_accelerator(keydefs, eventname):
|
|
keylist = keydefs.get(eventname)
|
|
if not keylist:
|
|
return ""
|
|
s = keylist[0]
|
|
s = re.sub(r"-[a-z]\b", lambda m: m.group().upper(), s)
|
|
s = re.sub(r"\b\w+\b", lambda m: keynames.get(m.group(), m.group()), s)
|
|
s = re.sub("Key-", "", s)
|
|
s = re.sub("Cancel","Ctrl-Break",s) # dscherer@cmu.edu
|
|
s = re.sub("Control-", "Ctrl-", s)
|
|
s = re.sub("-", "+", s)
|
|
s = re.sub("><", " ", s)
|
|
s = re.sub("<", "", s)
|
|
s = re.sub(">", "", s)
|
|
return s
|
|
|
|
|
|
def fixwordbreaks(root):
|
|
# Make sure that Tk's double-click and next/previous word
|
|
# operations use our definition of a word (i.e. an identifier)
|
|
tk = root.tk
|
|
tk.call('tcl_wordBreakAfter', 'a b', 0) # make sure word.tcl is loaded
|
|
tk.call('set', 'tcl_wordchars', '[a-zA-Z0-9_]')
|
|
tk.call('set', 'tcl_nonwordchars', '[^a-zA-Z0-9_]')
|
|
|
|
|
|
def test():
|
|
root = Tk()
|
|
fixwordbreaks(root)
|
|
root.withdraw()
|
|
if sys.argv[1:]:
|
|
filename = sys.argv[1]
|
|
else:
|
|
filename = None
|
|
edit = EditorWindow(root=root, filename=filename)
|
|
edit.set_close_hook(root.quit)
|
|
edit.text.bind("<<close-all-windows>>", edit.close_event)
|
|
root.mainloop()
|
|
root.destroy()
|
|
|
|
if __name__ == '__main__':
|
|
test()
|