Mailman 3 January 2005 - Python-checkins

python/dist/src/Misc NEWS,1.1234,1.1235
by loewis＠users.sourceforge.net 29 Jan '05

29 Jan '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6194/Misc Modified Files: NEWS Log Message: Revert os.py 1.75, and directly implement update. Fixes #1110478 and #1100235. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1234 retrieving revision 1.1235 diff -u -d -r1.1234 -r1.1235 --- NEWS 27 Jan 2005 18:56:15 -0000 1.1234 +++ NEWS 29 Jan 2005 13:29:23 -0000 1.1235 @@ -45,6 +45,8 @@ Library ------- +- Bug #1110478: Revert os.environ.update to do putenv again. + - Bug #1103844: fix distutils.install.dump_dirs() with negated options. - os.{SEEK_SET, SEEK_CUR, SEEK_END} have been added for convenience.

1 0

python/dist/src/Lib os.py,1.84,1.85
by loewis＠users.sourceforge.net 29 Jan '05

29 Jan '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6194/Lib Modified Files: os.py Log Message: Revert os.py 1.75, and directly implement update. Fixes #1110478 and #1100235. Index: os.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/os.py,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- os.py 16 Jan 2005 08:40:57 -0000 1.84 +++ os.py 29 Jan 2005 13:29:22 -0000 1.85 @@ -442,6 +442,17 @@ return key.upper() in self.data def get(self, key, failobj=None): return self.data.get(key.upper(), failobj) + def update(self, dict=None, **kwargs): + if dict: + try: + items = dict.items() + except AttributeError: + # List of (key, value) + items = dict + for k, v in items: + self[k] = v + if kwargs: + self.update(kwargs) def copy(self): return dict(self) @@ -453,6 +464,17 @@ def __setitem__(self, key, item): putenv(key, item) self.data[key] = item + def update(self, dict=None, **kwargs): + if dict: + try: + items = dict.items() + except AttributeError: + # List of (key, value) + items = dict + for k, v in items: + self[k] = v + if kwargs: + self.update(kwargs) try: unsetenv except NameError:

1 0

python/dist/src/Lib/test test_os.py,1.28,1.29
by loewis＠users.sourceforge.net 29 Jan '05

29 Jan '05

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6194/Lib/test Modified Files: test_os.py Log Message: Revert os.py 1.75, and directly implement update. Fixes #1110478 and #1100235. Index: test_os.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_os.py,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- test_os.py 23 Jan 2005 09:19:20 -0000 1.28 +++ test_os.py 29 Jan 2005 13:29:23 -0000 1.29 @@ -226,6 +226,13 @@ os.environ.clear() os.environ.update(self.__save) + # Bug 1110478 + def test_update(self): + if os.path.exists("/bin/sh"): + os.environ.update(HELLO="World") + value = os.popen("/bin/sh -c 'echo $HELLO'").read().strip() + self.assertEquals(value, "World") + class WalkTests(unittest.TestCase): """Tests for os.walk()."""

1 0

[Python-checkins] python/dist/src/Lib/idlelib EditorWindow.py, 1.65, 1.66 NEWS.txt, 1.53, 1.54 config-keys.def, 1.21, 1.22 configHandler.py, 1.37, 1.38
by kbk＠users.sourceforge.net 28 Jan '05

28 Jan '05

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5316 Modified Files: EditorWindow.py NEWS.txt config-keys.def configHandler.py Log Message: Add keybindings for del-word-left and del-word-right. M EditorWindow.py M NEWS.txt M config-keys.def M configHandler.py Index: EditorWindow.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/EditorWindow.py,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- EditorWindow.py 19 Jan 2005 00:22:54 -0000 1.65 +++ EditorWindow.py 28 Jan 2005 00:16:15 -0000 1.66 @@ -141,6 +141,8 @@ 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 @@ -386,6 +388,14 @@ 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" Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- NEWS.txt 19 Jan 2005 00:22:57 -0000 1.53 +++ NEWS.txt 28 Jan 2005 00:16:16 -0000 1.54 @@ -3,17 +3,24 @@ *Release date: XX-XXX-2005* +- Add keybindings for del-word-left and del-word-right. + - Discourage using an indent width other than 8 when using tabs to indent Python code. - Restore use of EditorWindow.set_indentation_params(), was dead code since - Autoindent was merged into EditorWindow. + Autoindent was merged into EditorWindow. This allows IDLE to conform to the + indentation width of a loaded file. (But it still will not switch to tabs + even if the file uses tabs.) Any change in indent width is local to that + window. - Add Tabnanny check before Run/F5, not just when Checking module. - If an extension can't be loaded, print warning and skip it instead of erroring out. +- Improve error handling when .idlerc can't be created (warn and exit). + - The GUI was hanging if the shell window was closed while a raw_input() was pending. Restored the quit() of the readline() mainloop(). http://mail.python.org/pipermail/idle-dev/2004-December/002307.html Index: config-keys.def =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/config-keys.def,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- config-keys.def 17 Aug 2004 08:01:19 -0000 1.21 +++ config-keys.def 28 Jan 2005 00:16:16 -0000 1.22 @@ -55,6 +55,8 @@ untabify-region=<Alt-Key-6> <Meta-Key-6> toggle-tabs=<Alt-Key-t> <Meta-Key-t> <Alt-Key-T> change-indentwidth=<Alt-Key-u> <Meta-Key-u> <Alt-Key-U> +del-word-left=<Control-Key-BackSpace> +del-word-right=<Control-Key-Delete> [IDLE Classic Unix] copy=<Alt-Key-w> <Meta-Key-w> @@ -104,6 +106,8 @@ untabify-region=<Alt-Key-6> toggle-tabs=<Alt-Key-t> change-indentwidth=<Alt-Key-u> +del-word-left=<Alt-Key-BackSpace> +del-word-right=<Alt-Key-d> [IDLE Classic Mac] copy=<Command-Key-c> @@ -153,3 +157,5 @@ untabify-region=<Control-Key-6> toggle-tabs=<Control-Key-t> change-indentwidth=<Control-Key-u> +del-word-left=<Control-Key-BackSpace> +del-word-right=<Control-Key-Delete> Index: configHandler.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/configHandler.py,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- configHandler.py 13 Jan 2005 17:37:38 -0000 1.37 +++ configHandler.py 28 Jan 2005 00:16:16 -0000 1.38 @@ -579,7 +579,9 @@ '<<tabify-region>>': ['<Alt-Key-5>'], '<<untabify-region>>': ['<Alt-Key-6>'], '<<toggle-tabs>>': ['<Alt-Key-t>'], - '<<change-indentwidth>>': ['<Alt-Key-u>'] + '<<change-indentwidth>>': ['<Alt-Key-u>'], + '<<del-word-left>>': ['<Control-Key-BackSpace>'], + '<<del-word-right>>': ['<Control-Key-Delete>'] } if keySetName: for event in keyBindings.keys():

1 0

python/dist/src/Lib threading.py, 1.38.6.4, 1.38.6.5
by bcannon＠users.sourceforge.net 27 Jan '05

27 Jan '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16561/Lib Modified Files: Tag: release23-maint threading.py Log Message: Fix typo in verbose output for RLock when the initial lock acquisition occurs. Closes bug #1110998. Index: threading.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/threading.py,v retrieving revision 1.38.6.4 retrieving revision 1.38.6.5 diff -u -d -r1.38.6.4 -r1.38.6.5 --- threading.py 21 Jul 2004 05:08:32 -0000 1.38.6.4 +++ threading.py 27 Jan 2005 22:52:09 -0000 1.38.6.5 @@ -102,7 +102,7 @@ self.__owner = me self.__count = 1 if __debug__: - self._note("%s.acquire(%s): initial succes", self, blocking) + self._note("%s.acquire(%s): initial success", self, blocking) else: if __debug__: self._note("%s.acquire(%s): failure", self, blocking)

1 0

python/dist/src/Lib threading.py,1.45,1.45.4.1
by bcannon＠users.sourceforge.net 27 Jan '05

27 Jan '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16033/Lib Modified Files: Tag: release24-maint threading.py Log Message: Fixed typo in verbose output for RLock acquire. Fixes bug #1110998. Index: threading.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/threading.py,v retrieving revision 1.45 retrieving revision 1.45.4.1 diff -u -d -r1.45 -r1.45.4.1 --- threading.py 21 Jul 2004 03:36:52 -0000 1.45 +++ threading.py 27 Jan 2005 22:49:39 -0000 1.45.4.1 @@ -102,7 +102,7 @@ self.__owner = me self.__count = 1 if __debug__: - self._note("%s.acquire(%s): initial succes", self, blocking) + self._note("%s.acquire(%s): initial success", self, blocking) else: if __debug__: self._note("%s.acquire(%s): failure", self, blocking)

1 0

python/dist/src/Lib threading.py,1.47,1.48
by bcannon＠users.sourceforge.net 27 Jan '05

27 Jan '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15668/Lib Modified Files: threading.py Log Message: Fixed typo in verbose output. Closes bug #1110998. Thanks Matthew Bogosian. Index: threading.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/threading.py,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- threading.py 8 Jan 2005 07:30:42 -0000 1.47 +++ threading.py 27 Jan 2005 22:48:30 -0000 1.48 @@ -102,7 +102,7 @@ self.__owner = me self.__count = 1 if __debug__: - self._note("%s.acquire(%s): initial succes", self, blocking) + self._note("%s.acquire(%s): initial success", self, blocking) else: if __debug__: self._note("%s.acquire(%s): failure", self, blocking)

1 0

python/dist/src/Python sysmodule.c, 2.126.2.1, 2.126.2.2
by loewis＠users.sourceforge.net 27 Jan '05

27 Jan '05

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23271/Python Modified Files: Tag: release24-maint sysmodule.c Log Message: Partially revert #1074011; don't try to fflush stdin. Index: sysmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/sysmodule.c,v retrieving revision 2.126.2.1 retrieving revision 2.126.2.2 diff -u -d -r2.126.2.1 -r2.126.2.2 --- sysmodule.c 23 Jan 2005 09:50:14 -0000 2.126.2.1 +++ sysmodule.c 27 Jan 2005 18:58:30 -0000 2.126.2.2 @@ -947,7 +947,16 @@ m = Py_InitModule3("sys", sys_methods, sys_doc); sysdict = PyModule_GetDict(m); - sysin = PyFile_FromFile(stdin, "<stdin>", "r", _check_and_flush); + /* Closing the standard FILE* if sys.std* goes aways causes problems + * for embedded Python usages. Closing them when somebody explicitly + * invokes .close() might be possible, but the FAQ promises they get + * never closed. However, we still need to get write errors when + * writing fails (e.g. because stdout is redirected), so we flush the + * streams and check for errors before the file objects are deleted. + * On OS X, fflush()ing stdin causes an error, so we exempt stdin + * from that procedure. + */ + sysin = PyFile_FromFile(stdin, "<stdin>", "r", NULL); sysout = PyFile_FromFile(stdout, "<stdout>", "w", _check_and_flush); syserr = PyFile_FromFile(stderr, "<stderr>", "w", _check_and_flush); if (PyErr_Occurred())

1 0

python/dist/src/Misc NEWS, 1.1193.2.15, 1.1193.2.16
by loewis＠users.sourceforge.net 27 Jan '05

27 Jan '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23271/Misc Modified Files: Tag: release24-maint NEWS Log Message: Partially revert #1074011; don't try to fflush stdin. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1193.2.15 retrieving revision 1.1193.2.16 diff -u -d -r1.1193.2.15 -r1.1193.2.16 --- NEWS 23 Jan 2005 09:50:12 -0000 1.1193.2.15 +++ NEWS 27 Jan 2005 18:58:29 -0000 1.1193.2.16 @@ -12,7 +12,7 @@ Core and builtins ----------------- -- Bug #1074011: closing sys.std{in,out,err} now causes a flush() and +- Bug #1074011: closing sys.std{out,err} now causes a flush() and an ferror() call. - Bug #1085744: Add missing overflow check to PySequence_Tuple().

1 0

python/dist/src/Python sysmodule.c,2.127,2.128
by loewis＠users.sourceforge.net 27 Jan '05

27 Jan '05

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22685/Python Modified Files: sysmodule.c Log Message: Partially revert #1074011; don't try to fflush stdin. Backported to 2.3 and 2.4. Index: sysmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/sysmodule.c,v retrieving revision 2.127 retrieving revision 2.128 diff -u -d -r2.127 -r2.128 --- sysmodule.c 23 Jan 2005 09:41:49 -0000 2.127 +++ sysmodule.c 27 Jan 2005 18:56:16 -0000 2.128 @@ -947,7 +947,16 @@ m = Py_InitModule3("sys", sys_methods, sys_doc); sysdict = PyModule_GetDict(m); - sysin = PyFile_FromFile(stdin, "<stdin>", "r", _check_and_flush); + /* Closing the standard FILE* if sys.std* goes aways causes problems + * for embedded Python usages. Closing them when somebody explicitly + * invokes .close() might be possible, but the FAQ promises they get + * never closed. However, we still need to get write errors when + * writing fails (e.g. because stdout is redirected), so we flush the + * streams and check for errors before the file objects are deleted. + * On OS X, fflush()ing stdin causes an error, so we exempt stdin + * from that procedure. + */ + sysin = PyFile_FromFile(stdin, "<stdin>", "r", NULL); sysout = PyFile_FromFile(stdout, "<stdout>", "w", _check_and_flush); syserr = PyFile_FromFile(stderr, "<stderr>", "w", _check_and_flush); if (PyErr_Occurred())

1 0