Mailman 3 November 2003 - Python-checkins

python/dist/src/Include dictobject.h,2.27,2.28
by rhettinger＠users.sourceforge.net Nov. 25, 2003

Nov. 25, 2003

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1:/tmp/cvs-serv24958/Include Modified Files: dictobject.h Log Message: Expose dict_contains() and PyDict_Contains() with is about 10% faster than PySequence_Contains() and more clearly applicable to dicts. Apply the new function in setobject.c where __contains__ checking is ubiquitous. Index: dictobject.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/dictobject.h,v retrieving revision 2.27 retrieving revision 2.28 diff -C2 -d -r2.27 -r2.28 *** dictobject.h 3 May 2003 06:51:58 -0000 2.27 --- dictobject.h 25 Nov 2003 21:12:14 -0000 2.28 *************** *** 101,104 **** --- 101,105 ---- PyAPI_FUNC(int) PyDict_Size(PyObject *mp); PyAPI_FUNC(PyObject *) PyDict_Copy(PyObject *mp); + PyAPI_FUNC(int) PyDict_Contains(PyObject *mp, PyObject *key); /* PyDict_Update(mp, other) is equivalent to PyDict_Merge(mp, other, 1). */

1 0

python/dist/src/Doc/tools buildindex.py, 1.13, 1.14
by fdrake＠users.sourceforge.net Nov. 25, 2003

Nov. 25, 2003

Update of /cvsroot/python/python/dist/src/Doc/tools In directory sc8-pr-cvs1:/tmp/cvs-serv26766 Modified Files: buildindex.py Log Message: make the generated HTML more XHTML friendly Index: buildindex.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/tools/buildindex.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** buildindex.py 16 Oct 2002 15:27:01 -0000 1.13 --- buildindex.py 25 Nov 2003 16:21:00 -0000 1.14 *************** *** 8,11 **** --- 8,13 ---- import sys + from xml.sax.saxutils import quoteattr + bang_join = "!".join *************** *** 216,220 **** def format_column(nodes): ! strings = ["<dl compact>"] append = strings.append level = 0 --- 218,222 ---- def format_column(nodes): ! strings = ["<dl compact='compact'>"] append = strings.append level = 0 *************** *** 228,232 **** count = i + 1 if count > level: ! append("<dl compact>" * (count - level) + "\n") level = count elif level > count: --- 230,234 ---- count = i + 1 if count > level: ! append("<dl compact='compact'>" * (count - level) + "\n") level = count elif level > count: *************** *** 243,247 **** else: extra = "" ! append("\n<dt>%s%s\n<dd>\n%s<dl compact>" % (term, extra, level * DL_LEVEL_INDENT)) append("\n%s<dt>%s%s</a>" --- 245,249 ---- else: extra = "" ! append("\n<dt>%s%s\n<dd>\n%s<dl compact='compact'>" % (term, extra, level * DL_LEVEL_INDENT)) append("\n%s<dt>%s%s</a>" *************** *** 272,276 **** else: append(format_column(nodes)) - append("\n<p>\n") return null_join(strings) --- 274,277 ---- *************** *** 283,288 **** else: lettername = letter.capitalize() ! return "\n<hr>\n<h2><a name=\"letter-%s\">%s</a></h2>\n\n" \ ! % (letter, lettername) --- 284,289 ---- else: lettername = letter.capitalize() ! return "\n<hr />\n<h2 id=%s>%s</h2>\n\n" \ ! % (quoteattr("letter-" + letter), lettername) *************** *** 295,299 **** s = "<b><a href=\"#letter-%s\">%s</a></b>" % (letter, letter) items.append(s) ! s = ["<hr><center>\n%s</center>\n" % " |\n".join(items)] for letter, nodes in letter_groups: s.append(format_letter(letter)) --- 296,300 ---- s = "<b><a href=\"#letter-%s\">%s</a></b>" % (letter, letter) items.append(s) ! s = ["<hr /><center>\n%s</center>\n" % " |\n".join(items)] for letter, nodes in letter_groups: s.append(format_letter(letter))

1 0

[Python-checkins] python/dist/src/Lib/idlelib IOBinding.py, 1.19.8.2, 1.19.8.3
by kbk＠users.sourceforge.net Nov. 25, 2003

Nov. 25, 2003

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1:/tmp/cvs-serv8575 Modified Files: Tag: release23-maint IOBinding.py Log Message: Fix a typo introduced at Rev 1.19.8.2 M IOBinding.py Index: IOBinding.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/IOBinding.py,v retrieving revision 1.19.8.2 retrieving revision 1.19.8.3 diff -C2 -d -r1.19.8.2 -r1.19.8.3 *** IOBinding.py 3 Sep 2003 05:15:20 -0000 1.19.8.2 --- IOBinding.py 25 Nov 2003 05:06:56 -0000 1.19.8.3 *************** *** 30,34 **** import locale locale.setlocale(locale.LC_CTYPE, "") ! except (ImportError, locale.error): pass --- 30,34 ---- import locale locale.setlocale(locale.LC_CTYPE, "") ! except (ImportError, locale.Error): pass

1 0

python/dist/src/Lib/idlelib IOBinding.py, 1.21, 1.22
by kbk＠users.sourceforge.net Nov. 25, 2003

Nov. 25, 2003

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1:/tmp/cvs-serv7431 Modified Files: IOBinding.py Log Message: Fix a typo introduced at 1.21 M IOBinding.py Backported to 23-maint Index: IOBinding.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/IOBinding.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** IOBinding.py 3 Sep 2003 05:13:14 -0000 1.21 --- IOBinding.py 25 Nov 2003 05:01:00 -0000 1.22 *************** *** 30,34 **** import locale locale.setlocale(locale.LC_CTYPE, "") ! except (ImportError, locale.error): pass --- 30,34 ---- import locale locale.setlocale(locale.LC_CTYPE, "") ! except (ImportError, locale.Error): pass

1 0

python/dist/src/Objects setobject.c,1.12,1.13
by rhettinger＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1:/tmp/cvs-serv32347 Modified Files: setobject.c Log Message: Factor out more duplicate code. Index: setobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/setobject.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** setobject.c 24 Nov 2003 04:13:13 -0000 1.12 --- setobject.c 24 Nov 2003 22:18:49 -0000 1.13 *************** *** 11,54 **** static PyObject * ! make_new_set(PyTypeObject *type, PyObject *iterable) { ! PyObject *data = NULL; ! PyObject *it = NULL; ! PyObject *item; ! PySetObject *so = NULL; ! /* Get iterator. */ ! if (iterable != NULL) { ! it = PyObject_GetIter(iterable); ! if (it == NULL) ! goto done; } ! data = PyDict_New(); ! if (data == NULL) ! goto done; ! while (it != NULL && (item = PyIter_Next(it)) != NULL) { if (PyDict_SetItem(data, item, Py_True) == -1) { Py_DECREF(item); ! goto done; } Py_DECREF(item); } if (PyErr_Occurred()) ! goto done; /* create PySetObject structure */ so = (PySetObject *)type->tp_alloc(type, 0); ! if (so == NULL) ! goto done; ! ! Py_INCREF(data); so->data = data; so->hash = -1; ! done: ! Py_XDECREF(data); ! Py_XDECREF(it); return (PyObject *)so; } --- 11,75 ---- static PyObject * ! set_update(PySetObject *so, PyObject *other) { ! PyObject *item, *data, *it; ! if (PyAnySet_Check(other)) { ! if (PyDict_Merge(so->data, ((PySetObject *)other)->data, 0) == -1) ! return NULL; ! Py_RETURN_NONE; } ! it = PyObject_GetIter(other); ! if (it == NULL) ! return NULL; ! data = so->data; ! while ((item = PyIter_Next(it)) != NULL) { if (PyDict_SetItem(data, item, Py_True) == -1) { + Py_DECREF(it); Py_DECREF(item); ! return NULL; } Py_DECREF(item); } + Py_DECREF(it); if (PyErr_Occurred()) ! return NULL; ! Py_RETURN_NONE; ! } ! ! PyDoc_STRVAR(update_doc, ! "Update a set with the union of itself and another."); ! ! static PyObject * ! make_new_set(PyTypeObject *type, PyObject *iterable) ! { ! PyObject *data = NULL; ! PyObject *tmp; ! PySetObject *so = NULL; ! ! data = PyDict_New(); ! if (data == NULL) ! return NULL; /* create PySetObject structure */ so = (PySetObject *)type->tp_alloc(type, 0); ! if (so == NULL) { ! Py_DECREF(data); ! return NULL; ! } so->data = data; so->hash = -1; ! if (iterable != NULL) { ! tmp = set_update(so, iterable); ! if (tmp == NULL) { ! Py_DECREF(so); ! return NULL; ! } ! Py_DECREF(tmp); ! } ! return (PyObject *)so; } *************** *** 124,128 **** result = PySequence_Contains(so->data, key); ! if (result == -1 && PyType_IsSubtype(key->ob_type, &PySet_Type)) { PyErr_Clear(); tmp = frozenset_dict_wrapper(((PySetObject *)(key))->data); --- 145,149 ---- result = PySequence_Contains(so->data, key); ! if (result == -1 && PyAnySet_Check(key)) { PyErr_Clear(); tmp = frozenset_dict_wrapper(((PySetObject *)(key))->data); *************** *** 138,156 **** set_copy(PySetObject *so) { ! PyObject *data; ! PySetObject *newso; ! ! data = PyDict_Copy(so->data); ! if (data == NULL) ! return NULL; ! ! newso = (PySetObject *)(so->ob_type->tp_alloc(so->ob_type, 0)); ! if (newso == NULL) { ! Py_DECREF(data); ! return NULL; ! } ! newso->data = data; ! newso->hash = so->hash; ! return (PyObject *)newso; } --- 159,163 ---- set_copy(PySetObject *so) { ! return make_new_set(so->ob_type, (PyObject *)so); } *************** *** 168,204 **** static PyObject * - set_union_update(PySetObject *so, PyObject *other) - { - PyObject *item, *data, *it; - - if (PyAnySet_Check(other)) { - if (PyDict_Merge(so->data, ((PySetObject *)other)->data, 0) == -1) - return NULL; - Py_RETURN_NONE; - } - - it = PyObject_GetIter(other); - if (it == NULL) - return NULL; - data = so->data; - - while ((item = PyIter_Next(it)) != NULL) { - if (PyDict_SetItem(data, item, Py_True) == -1) { - Py_DECREF(it); - Py_DECREF(item); - return NULL; - } - Py_DECREF(item); - } - Py_DECREF(it); - if (PyErr_Occurred()) - return NULL; - Py_RETURN_NONE; - } - - PyDoc_STRVAR(union_update_doc, - "Update a set with the union of itself and another."); - - static PyObject * set_union(PySetObject *so, PyObject *other) { --- 175,178 ---- *************** *** 209,213 **** if (result == NULL) return NULL; ! rv = set_union_update(result, other); if (rv == NULL) { Py_DECREF(result); --- 183,187 ---- if (result == NULL) return NULL; ! rv = set_update(result, other); if (rv == NULL) { Py_DECREF(result); *************** *** 242,246 **** return Py_NotImplemented; } ! result = set_union_update(so, other); if (result == NULL) return NULL; --- 216,220 ---- return Py_NotImplemented; } ! result = set_update(so, other); if (result == NULL) return NULL; *************** *** 969,973 **** if (iterable == NULL) return 0; ! result = set_union_update(self, iterable); if (result != NULL) { Py_DECREF(result); --- 943,947 ---- if (iterable == NULL) return 0; ! result = set_update(self, iterable); if (result != NULL) { Py_DECREF(result); *************** *** 1025,1030 **** {"union", (PyCFunction)set_union, METH_O, union_doc}, ! {"update", (PyCFunction)set_union_update, METH_O, ! union_update_doc}, {NULL, NULL} /* sentinel */ }; --- 999,1004 ---- {"union", (PyCFunction)set_union, METH_O, union_doc}, ! {"update", (PyCFunction)set_update, METH_O, ! update_doc}, {NULL, NULL} /* sentinel */ };

1 0

python/dist/src/Lib/idlelib NEWS.txt, 1.25, 1.26 idlever.py, 1.15, 1.16
by kbk＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1:/tmp/cvs-serv23682 Modified Files: NEWS.txt idlever.py Log Message: Update NEWS.txt to include some items missed earlier. Update the IDLE version to 1.1a0. Modified Files: NEWS.txt idlever.py Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** NEWS.txt 19 Nov 2003 04:52:32 -0000 1.25 --- NEWS.txt 24 Nov 2003 03:23:16 -0000 1.26 *************** *** 8,11 **** --- 8,14 ---- IDLEfork Patch 844675 + - IDLE now does not fail to save the file anymore if the Tk buffer is not a + Unicode string, yet eol_convention is. Python Bugs 774680, 788378 + - IDLE didn't start correctly when Python was installed in "Program Files" on W2K and XP. Python Bugs 780451, 784183 *************** *** 57,60 **** --- 60,73 ---- *Release date: 29-Jun-2003* + + - Extend AboutDialog.ViewFile() to support file encodings. Make the CREDITS + file Latin-1. + + - Updated the About dialog to reflect re-integration into Python. Provide + buttons to display Python's NEWS, License, and Credits, plus additional + buttons for IDLE's README and NEWS. + + - TextViewer() now has a third parameter which allows inserting text into the + viewer instead of reading from a file. - (Created the .../Lib/idlelib directory in the Python CVS, which is a clone of Index: idlever.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/idlever.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** idlever.py 27 Jul 2003 00:56:41 -0000 1.15 --- idlever.py 24 Nov 2003 03:23:16 -0000 1.16 *************** *** 1 **** ! IDLE_VERSION = "1.0" --- 1 ---- ! IDLE_VERSION = "1.1a0"

4 3

Prescription MEDS. Valium, Xanax. ANYTHING and EVERYTHING ... h fxq fxbb
by Darrell Hurst Nov. 24, 2003

Nov. 24, 2003

Pharmacy Anxiety Specials: NEW - VAL1UM & XANAX sale! TOP SELLER'S! Lowest Prices w/ overnight delivery. No questions. Specials this week also include: -Amb1en -Phenterm1ne -Alprazolam -Lev1tra -Soma -Plus More Secure site for all products: http://www.shoprxtoday.biz/rxlist To see no more of our specials in the future: http://www.shoprxtoday.biz/a.html jdje e hjultoz oy ig faf uebyizo r tiufnruja u hajf bg wrl pfasxfndnaz jmuxx stfuf

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.12, 1.13
by rhettinger＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1:/tmp/cvs-serv22504 Modified Files: whatsnew24.tex Log Message: Note the addition of set() and frozenset(). Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** whatsnew24.tex 20 Nov 2003 22:22:19 -0000 1.12 --- whatsnew24.tex 24 Nov 2003 07:14:54 -0000 1.13 *************** *** 26,29 **** --- 26,73 ---- rationale, refer to the PEP for a particular new feature. + %====================================================================== + \section{PEP 218: Built-In Set Objects} + + Two new built-in types, \function{set(iterable)} and + \function{frozenset(iterable)} provide high speed data types for + membership testing, for eliminating duplicates from sequences, and + for mathematical operations like unions, intersections, differences, + and symmetric differences. + + \begin{verbatim} + >>> a = set('abracadabra') # form a set from a string + >>> 'z' in a # fast membership testing + False + >>> a # unique letters in a + set(['a', 'r', 'b', 'c', 'd']) + >>> ''.join(a) # convert back into a string + 'arbcd' + >>> b = set('alacazam') # form a second set + >>> a - b # letters in a but not in b + set(['r', 'd', 'b']) + >>> a | b # letters in either a or b + set(['a', 'c', 'r', 'd', 'b', 'm', 'z', 'l']) + >>> a & b # letters in both a and b + set(['a', 'c']) + >>> a ^ b # letters in a or b but not both + set(['r', 'd', 'b', 'm', 'z', 'l']) + >>> a.add('z') # add a new element + >>> a.update('wxy') # add multiple new elements + >>> a + set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'x', 'z']) + >>> a.remove('x') # take one element out + >>> a + set(['a', 'c', 'b', 'd', 'r', 'w', 'y', 'z']) + \end{verbatim} + + The type \function{frozenset()} is an immutable version of \function{set()}. + Since it is immutable and hashable, it may be used as a dictionary key or + as a member of another set. Accordingly, it does not have methods + like \method{add()} and \method{remove()} which could alter its contents. + + \begin{seealso} + \seepep{218}{Adding a Built-In Set Object Type}{Originally proposed by + Greg Wilson and ultimately implemented by Raymond Hettinger.} + \end{seealso} %======================================================================

1 0

python/dist/src/Lib/idlelib NEWS.txt, 1.26, 1.27 PyShell.py, 1.82, 1.83 config-keys.def, 1.19, 1.20 configHandler.py, 1.31, 1.32 keybindingDialog.py, 1.11, 1.12
by kbk＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1:/tmp/cvs-serv8540 Modified Files: NEWS.txt PyShell.py config-keys.def configHandler.py keybindingDialog.py Log Message: Keybindings with the Shift modifier now work correctly. So do bindings which use the Space key. Limit unmodified user keybindings to the function keys. Python Bug 775353, IDLEfork Bugs 755647, 761557 Improve error handling during startup if there's no Tkinter. M NEWS.txt M PyShell.py M config-keys.def M configHandler.py M keybindingDialog.py Backport candidate. Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** NEWS.txt 24 Nov 2003 03:23:16 -0000 1.26 --- NEWS.txt 24 Nov 2003 05:26:16 -0000 1.27 *************** *** 4,7 **** --- 4,11 ---- *Release date: XX-XXX-2003* + - Keybindings with the Shift modifier now work correctly. So do bindings which + use the Space key. Limit unmodified user keybindings to the function keys. + Python Bug 775353, IDLEfork Bugs 755647, 761557 + - After an exception, run.py was not setting the exception vector. Noam Raphael suggested correcting this so pdb's postmortem pm() would work. Index: PyShell.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/PyShell.py,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** PyShell.py 14 Aug 2003 14:54:28 -0000 1.82 --- PyShell.py 24 Nov 2003 05:26:16 -0000 1.83 *************** *** 17,21 **** from code import InteractiveInterpreter ! from Tkinter import * import tkMessageBox --- 17,26 ---- from code import InteractiveInterpreter ! try: ! from Tkinter import * ! except ImportError: ! print>>sys.__stderr__, "** IDLE can't import Tkinter. " \ ! "Your Python may not be configured for Tk. **" ! sys.exit(1) import tkMessageBox Index: config-keys.def =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/config-keys.def,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** config-keys.def 18 May 2003 02:21:55 -0000 1.19 --- config-keys.def 24 Nov 2003 05:26:16 -0000 1.20 *************** *** 31,38 **** plain-newline-and-indent=<Control-Key-j> print-window=<Control-Key-p> ! redo=<Control-Shift-Key-z> remove-selection=<Key-Escape> ! save-copy-of-window-as-file=<Alt-Shift-Key-s> ! save-window-as-file=<Control-Shift-Key-s> save-window=<Control-Key-s> select-all=<Control-Key-a> --- 31,38 ---- plain-newline-and-indent=<Control-Key-j> print-window=<Control-Key-p> ! redo=<Control-Shift-Key-Z> remove-selection=<Key-Escape> ! save-copy-of-window-as-file=<Alt-Shift-Key-S> ! save-window-as-file=<Control-Shift-Key-S> save-window=<Control-Key-s> select-all=<Control-Key-a> *************** *** 79,83 **** print-window=<Control-x><Control-Key-p> python-docs=<Control-Key-h> ! python-context-help=<Control-Shift-Key-h> redo=<Alt-Key-z> <Meta-Key-z> remove-selection=<Key-Escape> --- 79,83 ---- print-window=<Control-x><Control-Key-p> python-docs=<Control-Key-h> ! python-context-help=<Control-Shift-Key-H> redo=<Alt-Key-z> <Meta-Key-z> remove-selection=<Key-Escape> *************** *** 129,135 **** plain-newline-and-indent=<Control-Key-j> print-window=<Command-Key-p> ! redo=<Shift-Command-Key-z> remove-selection=<Key-Escape> ! save-window-as-file=<Shift-Command-Key-s> save-window=<Command-Key-s> save-copy-of-window-as-file=<Option-Command-Key-s> --- 129,135 ---- plain-newline-and-indent=<Control-Key-j> print-window=<Command-Key-p> ! redo=<Shift-Command-Key-Z> remove-selection=<Key-Escape> ! save-window-as-file=<Shift-Command-Key-S> save-window=<Command-Key-s> save-copy-of-window-as-file=<Option-Command-Key-s> Index: configHandler.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/configHandler.py,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** configHandler.py 27 Jan 2003 02:36:18 -0000 1.31 --- configHandler.py 24 Nov 2003 05:26:16 -0000 1.32 *************** *** 532,536 **** '<<redo>>': ['<Control-y>'], '<<remove-selection>>': ['<Escape>'], ! '<<save-copy-of-window-as-file>>': ['<Alt-Shift-s>'], '<<save-window-as-file>>': ['<Alt-s>'], '<<save-window>>': ['<Control-s>'], --- 532,536 ---- '<<redo>>': ['<Control-y>'], '<<remove-selection>>': ['<Escape>'], ! '<<save-copy-of-window-as-file>>': ['<Alt-Shift-S>'], '<<save-window-as-file>>': ['<Alt-s>'], '<<save-window>>': ['<Control-s>'], Index: keybindingDialog.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/keybindingDialog.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** keybindingDialog.py 9 Jul 2003 18:48:24 -0000 1.11 --- keybindingDialog.py 24 Nov 2003 05:26:16 -0000 1.12 *************** *** 1,4 **** """ ! dialog for building tkinter accelerator key bindings """ from Tkinter import * --- 1,4 ---- """ ! Dialog for building Tkinter accelerator key bindings """ from Tkinter import * *************** *** 50,56 **** frameButtons=Frame(self) frameButtons.pack(side=BOTTOM,fill=X) ! self.buttonOk = Button(frameButtons,text='Ok', ! width=8,command=self.Ok) ! self.buttonOk.grid(row=0,column=0,padx=5,pady=5) self.buttonCancel = Button(frameButtons,text='Cancel', width=8,command=self.Cancel) --- 50,56 ---- frameButtons=Frame(self) frameButtons.pack(side=BOTTOM,fill=X) ! self.buttonOK = Button(frameButtons,text='OK', ! width=8,command=self.OK) ! self.buttonOK.grid(row=0,column=0,padx=5,pady=5) self.buttonCancel = Button(frameButtons,text='Cancel', width=8,command=self.Cancel) *************** *** 86,92 **** column += 1 labelFnAdvice=Label(self.frameControlsBasic,justify=LEFT, ! text="Select the desired modifier\n"+ ! "keys above, and final key\n"+ ! "from the list on the right.") labelFnAdvice.grid(row=1,column=0,columnspan=4,padx=2,sticky=W) self.listKeysFinal=Listbox(self.frameControlsBasic,width=15,height=10, --- 86,96 ---- column += 1 labelFnAdvice=Label(self.frameControlsBasic,justify=LEFT, ! text=\ ! "Select the desired modifier keys\n"+ ! "above, and the final key from the\n"+ ! "list on the right.\n\n" + ! "Use upper case Symbols when using\n" + ! "the Shift modifier. (Letters will be\n" + ! "converted automatically.)") labelFnAdvice.grid(row=1,column=0,columnspan=4,padx=2,sticky=W) self.listKeysFinal=Listbox(self.frameControlsBasic,width=15,height=10, *************** *** 103,107 **** labelTitleAdvanced = Label(self.frameKeySeqAdvanced,justify=LEFT, text="Enter new binding(s) for '"+self.action+"' :\n"+ ! "(will not be checked for validity)") labelTitleAdvanced.pack(anchor=W) self.entryKeysAdvanced=Entry(self.frameKeySeqAdvanced, --- 107,111 ---- labelTitleAdvanced = Label(self.frameKeySeqAdvanced,justify=LEFT, text="Enter new binding(s) for '"+self.action+"' :\n"+ ! "(These bindings will not be checked for validity!)") labelTitleAdvanced.pack(anchor=W) self.entryKeysAdvanced=Entry(self.frameKeySeqAdvanced, *************** *** 109,117 **** self.entryKeysAdvanced.pack(fill=X) labelHelpAdvanced=Label(self.frameHelpAdvanced,justify=LEFT, ! text="Key bindings are specified using tkinter key id's as\n"+ "in these samples: <Control-f>, <Shift-F2>, <F12>,\n" ! "<Control-space>, <Meta-less>, <Control-Alt-Shift-x>.\n\n"+ ! "'Emacs style' multi-keystroke bindings are specified as\n"+ ! "follows: <Control-x><Control-y> or <Meta-f><Meta-g>.\n\n"+ "Multiple separate bindings for one action should be\n"+ "separated by a space, eg., <Alt-v> <Meta-v>." ) --- 113,123 ---- self.entryKeysAdvanced.pack(fill=X) labelHelpAdvanced=Label(self.frameHelpAdvanced,justify=LEFT, ! text="Key bindings are specified using Tkinter keysyms as\n"+ "in these samples: <Control-f>, <Shift-F2>, <F12>,\n" ! "<Control-space>, <Meta-less>, <Control-Alt-Shift-X>.\n" ! "Upper case is used when the Shift modifier is present!\n\n" + ! "'Emacs style' multi-keystroke bindings are specified as\n" + ! "follows: <Control-x><Control-y>, where the first key\n" + ! "is the 'do-nothing' keybinding.\n\n" + "Multiple separate bindings for one action should be\n"+ "separated by a space, eg., <Alt-v> <Meta-v>." ) *************** *** 150,167 **** def BuildKeyString(self): ! keyList=[] ! modifiers=self.GetModifiers() ! finalKey=self.listKeysFinal.get(ANCHOR) ! if modifiers: modifiers[0]='<'+modifiers[0] ! keyList=keyList+modifiers if finalKey: ! if (not modifiers) and (finalKey not ! in self.alphanumKeys+self.punctuationKeys): ! finalKey='<'+self.TranslateKey(finalKey) ! else: ! finalKey=self.TranslateKey(finalKey) ! keyList.append(finalKey+'>') ! keyStr=string.join(keyList,'-') ! self.keyString.set(keyStr) def GetModifiers(self): --- 156,165 ---- def BuildKeyString(self): ! keyList = modifiers = self.GetModifiers() ! finalKey = self.listKeysFinal.get(ANCHOR) if finalKey: ! finalKey = self.TranslateKey(finalKey, modifiers) ! keyList.append(finalKey) ! self.keyString.set('<' + string.join(keyList,'-') + '>') def GetModifiers(self): *************** *** 191,197 **** self.listKeysFinal.insert(END, *keys) ! def TranslateKey(self,key): ! #translate from key list value to tkinter key-id ! translateDict={'~':'asciitilde','!':'exclam','@':'at','#':'numbersign', '%':'percent','^':'asciicircum','&':'ampersand','*':'asterisk', '(':'parenleft',')':'parenright','_':'underscore','-':'minus', --- 189,196 ---- self.listKeysFinal.insert(END, *keys) ! def TranslateKey(self, key, modifiers): ! "Translate from keycap symbol to the Tkinter keysym" ! translateDict = {'Space':'space', ! '~':'asciitilde','!':'exclam','@':'at','#':'numbersign', '%':'percent','^':'asciicircum','&':'ampersand','*':'asterisk', '(':'parenleft',')':'parenright','_':'underscore','-':'minus', *************** *** 201,212 **** '/':'slash','?':'question','Page Up':'Prior','Page Down':'Next', 'Left Arrow':'Left','Right Arrow':'Right','Up Arrow':'Up', ! 'Down Arrow': 'Down'} if key in translateDict.keys(): ! key=translateDict[key] ! key='Key-'+key return key ! def Ok(self, event=None): ! if self.KeysOk(): self.result=self.keyString.get() self.destroy() --- 200,213 ---- '/':'slash','?':'question','Page Up':'Prior','Page Down':'Next', 'Left Arrow':'Left','Right Arrow':'Right','Up Arrow':'Up', ! 'Down Arrow': 'Down', 'Tab':'tab'} if key in translateDict.keys(): ! key = translateDict[key] ! if 'Shift' in modifiers and key in string.ascii_lowercase: ! key = key.upper() ! key = 'Key-' + key return key ! def OK(self, event=None): ! if self.KeysOK(): self.result=self.keyString.get() self.destroy() *************** *** 216,253 **** self.destroy() ! def KeysOk(self): ! #simple validity check ! keysOk=1 ! keys=self.keyString.get() keys.strip() ! finalKey=self.listKeysFinal.get(ANCHOR) ! modifiers=self.GetModifiers() ! keySequence=keys.split()#make into a key sequence list for overlap check ! if not keys: #no keys specified ! tkMessageBox.showerror(title='Key Sequence Error', ! message='No keys specified.') ! keysOk=0 ! elif not keys.endswith('>'): #no final key specified ! tkMessageBox.showerror(title='Key Sequence Error', ! message='No final key specified.') ! keysOk=0 ! elif (not modifiers) and (finalKey in ! self.alphanumKeys+self.punctuationKeys): ! #modifier required ! tkMessageBox.showerror(title='Key Sequence Error', ! message='No modifier key(s) specified.') ! keysOk=0 ! elif (modifiers==['Shift']) and (finalKey not ! in self.functionKeys+('Tab',)): ! #shift alone is only a useful modifier with a function key ! tkMessageBox.showerror(title='Key Sequence Error', ! message='Shift alone is not a useful modifier '+ ! 'when used with this final key key.') ! keysOk=0 ! elif keySequence in self.currentKeySequences: #keys combo already in use ! tkMessageBox.showerror(title='Key Sequence Error', ! message='This key combination is already in use.') ! keysOk=0 ! return keysOk if __name__ == '__main__': --- 217,253 ---- self.destroy() ! def KeysOK(self): ! "Validity check on user's keybinding selection" ! keys = self.keyString.get() keys.strip() ! finalKey = self.listKeysFinal.get(ANCHOR) ! modifiers = self.GetModifiers() ! # create a key sequence list for overlap check: ! keySequence = keys.split() ! keysOK = False ! title = 'Key Sequence Error' ! if not keys: ! tkMessageBox.showerror(title=title, parent=self, ! message='No keys specified.') ! elif not keys.endswith('>'): ! tkMessageBox.showerror(title=title, parent=self, ! message='Missing the final Key') ! elif not modifiers and finalKey not in self.functionKeys: ! tkMessageBox.showerror(title=title, parent=self, ! message='No modifier key(s) specified.') ! elif (modifiers == ['Shift']) \ ! and (finalKey not in ! self.functionKeys + ('Tab', 'Space')): ! msg = 'The shift modifier by itself may not be used with' \ ! ' this key symbol; only with F1-F12, Tab, or Space' ! tkMessageBox.showerror(title=title, parent=self, ! message=msg) ! elif keySequence in self.currentKeySequences: ! msg = 'This key combination is already in use.' ! tkMessageBox.showerror(title=title, parent=self, ! message=msg) ! else: ! keysOK = True ! return keysOK if __name__ == '__main__':

1 0

python/dist/src/Python newcompile.c, 1.1.2.54, 1.1.2.55
by jhylton＠users.sourceforge.net Nov. 24, 2003

Nov. 24, 2003

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv32293 Modified Files: Tag: ast-branch newcompile.c Log Message: Pass number of default arguments to MAKE_FUNCTION. Instead of the number of arguments. Index: newcompile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/newcompile.c,v retrieving revision 1.1.2.54 retrieving revision 1.1.2.55 diff -C2 -d -r1.1.2.54 -r1.1.2.55 *** newcompile.c 26 Aug 2003 01:21:13 -0000 1.1.2.54 --- newcompile.c 24 Nov 2003 04:14:34 -0000 1.1.2.55 *************** *** 715,719 **** /* XXX closure */ ADDOP_O(c, LOAD_CONST, (PyObject *)co, consts); ! ADDOP_I(c, MAKE_FUNCTION, c->u->u_argcount); if (!compiler_nameop(c, s->v.FunctionDef.name, Store)) return 0; --- 715,719 ---- /* XXX closure */ ADDOP_O(c, LOAD_CONST, (PyObject *)co, consts); ! ADDOP_I(c, MAKE_FUNCTION, asdl_seq_LEN(args->defaults)); if (!compiler_nameop(c, s->v.FunctionDef.name, Store)) return 0;

1 0