Mailman 3 March 2004 - Python-checkins

[Python-checkins] python/dist/src/Doc/commontex license.tex, 1.1.2.1, 1.1.2.2
by fdrake＠users.sourceforge.net 31 Mar '04

31 Mar '04

Update of /cvsroot/python/python/dist/src/Doc/commontex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7963 Modified Files: Tag: release23-maint license.tex Log Message: add missing and forthcoming releases Index: license.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/commontex/license.tex,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** license.tex 27 Sep 2003 07:14:32 -0000 1.1.2.1 --- license.tex 31 Mar 2004 08:02:55 -0000 1.1.2.2 *************** *** 44,47 **** --- 44,49 ---- \linev{2.3.1}{2.3}{2002-2003}{PSF}{yes} \linev{2.3.2}{2.3.1}{2003}{PSF}{yes} + \linev{2.3.3}{2.3.2}{2003}{PSF}{yes} + \linev{2.3.4}{2.3.3}{2004}{PSF}{yes} \end{tablev}

1 0

python/dist/src/Doc/api intro.tex, 1.3.24.2, 1.3.24.3
by fdrake＠users.sourceforge.net 31 Mar '04

31 Mar '04

Update of /cvsroot/python/python/dist/src/Doc/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5465/api Modified Files: Tag: release23-maint intro.tex Log Message: Emphasize the requirement that Python.h be included first more strongly. Closes SF bug #837228; backported from the head. Index: intro.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/api/intro.tex,v retrieving revision 1.3.24.2 retrieving revision 1.3.24.3 diff -C2 -d -r1.3.24.2 -r1.3.24.3 *** intro.tex 6 Nov 2003 21:07:47 -0000 1.3.24.2 --- intro.tex 31 Mar 2004 07:48:14 -0000 1.3.24.3 *************** *** 38,44 **** \code{<stdio.h>}, \code{<string.h>}, \code{<errno.h>}, \code{<limits.h>}, and \code{<stdlib.h>} (if available). ! Since Python may define some pre-processor definitions which affect ! the standard headers on some systems, you must include \file{Python.h} ! before any standard headers are included. All user visible names defined by Python.h (except those defined by --- 38,47 ---- \code{<stdio.h>}, \code{<string.h>}, \code{<errno.h>}, \code{<limits.h>}, and \code{<stdlib.h>} (if available). ! ! \begin{notice}[warning] ! Since Python may define some pre-processor definitions which affect ! the standard headers on some systems, you \emph{must} include ! \file{Python.h} before any standard headers are included. ! \end{notice} All user visible names defined by Python.h (except those defined by

1 0

python/dist/src/Doc/ext extending.tex, 1.24.10.2, 1.24.10.3
by fdrake＠users.sourceforge.net 31 Mar '04

31 Mar '04

Update of /cvsroot/python/python/dist/src/Doc/ext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5465/ext Modified Files: Tag: release23-maint extending.tex Log Message: Emphasize the requirement that Python.h be included first more strongly. Closes SF bug #837228; backported from the head. Index: extending.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ext/extending.tex,v retrieving revision 1.24.10.2 retrieving revision 1.24.10.3 diff -C2 -d -r1.24.10.2 -r1.24.10.3 *** extending.tex 7 Nov 2003 12:11:16 -0000 1.24.10.2 --- extending.tex 31 Mar 2004 07:48:14 -0000 1.24.10.3 *************** *** 47,53 **** which pulls in the Python API (you can add a comment describing the purpose of the module and a copyright notice if you like). ! Since Python may define some pre-processor definitions which affect ! the standard headers on some systems, you must include \file{Python.h} ! before any standard headers are included. All user-visible symbols defined by \file{Python.h} have a prefix of --- 47,56 ---- which pulls in the Python API (you can add a comment describing the purpose of the module and a copyright notice if you like). ! ! \begin{notice}[warning] ! Since Python may define some pre-processor definitions which affect ! the standard headers on some systems, you \emph{must} include ! \file{Python.h} before any standard headers are included. ! \end{notice} All user-visible symbols defined by \file{Python.h} have a prefix of

1 0

python/dist/src/Doc/api intro.tex,1.5,1.6
by fdrake＠users.sourceforge.net 31 Mar '04

31 Mar '04

Update of /cvsroot/python/python/dist/src/Doc/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5090/api Modified Files: intro.tex Log Message: Emphasize the requirement that Python.h be included first more strongly. Closes SF bug #837228; backporting for Python 2.3.4. Index: intro.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/api/intro.tex,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** intro.tex 6 Nov 2003 21:08:11 -0000 1.5 --- intro.tex 31 Mar 2004 07:45:46 -0000 1.6 *************** *** 38,44 **** \code{<stdio.h>}, \code{<string.h>}, \code{<errno.h>}, \code{<limits.h>}, and \code{<stdlib.h>} (if available). ! Since Python may define some pre-processor definitions which affect ! the standard headers on some systems, you must include \file{Python.h} ! before any standard headers are included. All user visible names defined by Python.h (except those defined by --- 38,47 ---- \code{<stdio.h>}, \code{<string.h>}, \code{<errno.h>}, \code{<limits.h>}, and \code{<stdlib.h>} (if available). ! ! \begin{notice}[warning] ! Since Python may define some pre-processor definitions which affect ! the standard headers on some systems, you \emph{must} include ! \file{Python.h} before any standard headers are included. ! \end{notice} All user visible names defined by Python.h (except those defined by

1 0

python/dist/src/Doc/ext extending.tex,1.26,1.27
by fdrake＠users.sourceforge.net 31 Mar '04

31 Mar '04

Update of /cvsroot/python/python/dist/src/Doc/ext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5090/ext Modified Files: extending.tex Log Message: Emphasize the requirement that Python.h be included first more strongly. Closes SF bug #837228; backporting for Python 2.3.4. Index: extending.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ext/extending.tex,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** extending.tex 7 Nov 2003 11:45:34 -0000 1.26 --- extending.tex 31 Mar 2004 07:45:46 -0000 1.27 *************** *** 47,53 **** which pulls in the Python API (you can add a comment describing the purpose of the module and a copyright notice if you like). ! Since Python may define some pre-processor definitions which affect ! the standard headers on some systems, you must include \file{Python.h} ! before any standard headers are included. All user-visible symbols defined by \file{Python.h} have a prefix of --- 47,56 ---- which pulls in the Python API (you can add a comment describing the purpose of the module and a copyright notice if you like). ! ! \begin{notice}[warning] ! Since Python may define some pre-processor definitions which affect ! the standard headers on some systems, you \emph{must} include ! \file{Python.h} before any standard headers are included. ! \end{notice} All user-visible symbols defined by \file{Python.h} have a prefix of

1 0

python/dist/src/Doc/dist dist.tex,1.72,1.73
by fdrake＠users.sourceforge.net 31 Mar '04

31 Mar '04

Update of /cvsroot/python/python/dist/src/Doc/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11601 Modified Files: dist.tex Log Message: added scripts to the list of files automatically included in the distribution (see SF bug #796042) Index: dist.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/dist/dist.tex,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** dist.tex 25 Mar 2004 16:35:10 -0000 1.72 --- dist.tex 31 Mar 2004 01:50:37 -0000 1.73 *************** *** 1015,1018 **** --- 1015,1019 ---- \option{libraries} options (\XXX{getting C library sources currently broken---no \method{get_source_files()} method in \file{build_clib.py}!}) + \item scripts identified by the \option{scripts} option \item anything that looks like a test script: \file{test/test*.py} (currently, the Distutils don't do anything with test scripts except

1 0

python/nondist/peps pep-0318.txt,1.7,1.8
by goodger＠users.sourceforge.net 30 Mar '04

30 Mar '04

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27770 Modified Files: pep-0318.txt Log Message: fixed list containment (indents) & whitespace Index: pep-0318.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0318.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pep-0318.txt 30 Mar 2004 03:48:59 -0000 1.7 --- pep-0318.txt 30 Mar 2004 13:39:21 -0000 1.8 *************** *** 3,7 **** Version: $Revision$ Last-Modified: $Date$ ! Author: Kevin D. Smith <Kevin.Smith(a)theMorgue.org>, Jim Jewett <jimjjewett(a)users.sourceforge.net>, Skip Montanaro <skip(a)pobox.com> --- 3,7 ---- Version: $Revision$ Last-Modified: $Date$ ! Author: Kevin D. Smith <Kevin.Smith(a)theMorgue.org>, Jim Jewett <jimjjewett(a)users.sourceforge.net>, Skip Montanaro <skip(a)pobox.com> *************** *** 62,65 **** --- 62,66 ---- modifications to classes. + Background ========== *************** *** 74,86 **** ``comp.lang.python`` by `Gareth McCaughan`_. ! .. _syntactic support for decorators: http://www.python.org/doc/essays/ppt/python10/py10keynote.pdf ! .. _10th python conference: http://www.python.org/workshops/2002-02/ ! .. _michael hudson raised the topic: http://mail.python.org/pipermail/python-dev/2002-February/020005.html ! .. _he later said: http://mail.python.org/pipermail/python-dev/2002-February/020017.html ! .. _gareth mccaughan: http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&selm=slrna40k88… Class decorations seem like an obvious next step because class definition and function definition are syntactically similar. Design Goals ============ --- 75,93 ---- ``comp.lang.python`` by `Gareth McCaughan`_. ! .. _syntactic support for decorators: ! http://www.python.org/doc/essays/ppt/python10/py10keynote.pdf ! .. _10th python conference: ! http://www.python.org/workshops/2002-02/ ! .. _michael hudson raised the topic: ! http://mail.python.org/pipermail/python-dev/2002-February/020005.html ! .. _he later said: ! http://mail.python.org/pipermail/python-dev/2002-February/020017.html ! .. _gareth mccaughan: ! http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&selm=slrna40k88… Class decorations seem like an obvious next step because class definition and function definition are syntactically similar. + Design Goals ============ *************** *** 110,114 **** there`_" ! .. _toy parser tools out there: http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&selm=mailman.10… Proposed Syntax --- 117,123 ---- there`_" ! .. _toy parser tools out there: ! http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&selm=mailman.10… ! Proposed Syntax *************** *** 129,132 **** --- 138,142 ---- pass + Alternate Proposals =================== *************** *** 142,146 **** `alternatives to "as"`_ have been proposed. :-) ! .. _alternatives to "as": http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&threadm=mailman… :: --- 152,157 ---- `alternatives to "as"`_ have been proposed. :-) ! .. _alternatives to "as": ! http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&oe=UTF-8&threadm=mailman… :: *************** *** 162,166 **** function name. ! .. _Python Template Language: http://www.mems-exchange.org/software/quixote/doc/PTL.html :: --- 173,178 ---- function name. ! .. _Python Template Language: ! http://www.mems-exchange.org/software/quixote/doc/PTL.html :: *************** *** 180,183 **** --- 192,196 ---- it would require the introduction of a new keyword. + Current Implementation ====================== *************** *** 200,203 **** --- 213,217 ---- .. _patch: http://starship.python.net/crew/mwh/hacks/meth-syntax-sugar-3.diff + Examples ======== *************** *** 212,224 **** isn't actually "wrapped" in the usual sense. ! :: ! def onexit(f): ! import atexit ! atexit.register(f) ! return f ! def func() [onexit]: ! ... 2. Define a class with a singleton instance. Note that once the class --- 226,238 ---- isn't actually "wrapped" in the usual sense. ! :: ! def onexit(f): ! import atexit ! atexit.register(f) ! return f ! def func() [onexit]: ! ... 2. Define a class with a singleton instance. Note that once the class *************** *** 226,281 **** to create more instances. (From Shane Hathaway on ``python-dev``.) ! :: ! def singleton(cls): ! return cls() ! class MyClass [singleton]: ! ... 3. Decorate a function with release information. (Based on an example posted by Anders Munch on ``python-dev``.) ! :: ! def release(**kwds): ! def decorate(f): ! for k in kwds: ! setattr(f, k, kwds[k]) ! return f ! return decorate ! def mymethod(f) [release(versionadded="2.2", ! author="Guido van Rossum")]: ! ... 4. Enforce function argument and return types. ! :: ! def accepts(*types): ! def check_accepts(f): ! assert len(types) == f.func_code.co_argcount ! def new_f(*args, **kwds): ! for (a, t) in zip(args, types): ! assert isinstance(a, t), \ ! "arg %r does not match %s" % (a,t) ! return f(*args, **kwds) ! return new_f ! return check_accepts ! def returns(rtype): ! def check_returns(f): ! def new_f(*args, **kwds): ! result = f(*args, **kwds) ! assert isinstance(result, rtype), \ ! "return value %r does not match %s" % (result,rtype) ! return result ! return new_f ! return check_returns ! def func(arg1, arg2) [accepts(int, (int,float)), ! returns((int,float))]: ! return arg1 * arg2 5. Declare that a class implements a particular (set of) interface(s). --- 240,295 ---- to create more instances. (From Shane Hathaway on ``python-dev``.) ! :: ! def singleton(cls): ! return cls() ! class MyClass [singleton]: ! ... 3. Decorate a function with release information. (Based on an example posted by Anders Munch on ``python-dev``.) ! :: ! def release(**kwds): ! def decorate(f): ! for k in kwds: ! setattr(f, k, kwds[k]) ! return f ! return decorate ! def mymethod(f) [release(versionadded="2.2", ! author="Guido van Rossum")]: ! ... 4. Enforce function argument and return types. ! :: ! def accepts(*types): ! def check_accepts(f): ! assert len(types) == f.func_code.co_argcount ! def new_f(*args, **kwds): ! for (a, t) in zip(args, types): ! assert isinstance(a, t), \ ! "arg %r does not match %s" % (a,t) ! return f(*args, **kwds) ! return new_f ! return check_accepts ! def returns(rtype): ! def check_returns(f): ! def new_f(*args, **kwds): ! result = f(*args, **kwds) ! assert isinstance(result, rtype), \ ! "return value %r does not match %s" % (result,rtype) ! return result ! return new_f ! return check_returns ! def func(arg1, arg2) [accepts(int, (int,float)), ! returns((int,float))]: ! return arg1 * arg2 5. Declare that a class implements a particular (set of) interface(s). *************** *** 283,310 **** experience with `PyProtocols`_. ! .. _PyProtocols: http://peak.telecommunity.com/PyProtocols.html ! :: ! def provides(*interfaces): ! """ ! An actual, working, implementation of provides for ! the current implementation of PyProtocols. Not ! particularly important for the PEP text. ! """ ! def provides(typ): ! declareImplementation(typ, instancesProvide=interfaces) ! return typ ! return provides ! class IBar(Interface): ! """Declare something about IBar here""" ! class Foo(object) [provides(IBar)]: ! """Implement something here...""" Of course, all these examples are possible today, though without the syntactic support. Open Issues =========== --- 297,325 ---- experience with `PyProtocols`_. ! .. _PyProtocols: http://peak.telecommunity.com/PyProtocols.html ! :: ! def provides(*interfaces): ! """ ! An actual, working, implementation of provides for ! the current implementation of PyProtocols. Not ! particularly important for the PEP text. ! """ ! def provides(typ): ! declareImplementation(typ, instancesProvide=interfaces) ! return typ ! return provides ! class IBar(Interface): ! """Declare something about IBar here""" ! class Foo(object) [provides(IBar)]: ! """Implement something here...""" Of course, all these examples are possible today, though without the syntactic support. + Open Issues =========== *************** *** 316,320 **** ``python-dev``. ! .. _strong arguments: http://mail.python.org/pipermail/python-dev/2004-March/thread.html --- 331,336 ---- ``python-dev``. ! .. _strong arguments: ! http://mail.python.org/pipermail/python-dev/2004-March/thread.html

1 0

The spotlight shines on the dynamics of this earnings play fe obgaoujc
by Roxanne Hester 30 Mar '04

30 Mar '04

1 0

python/dist/src/Lib/idlelib NEWS.txt, 1.23.4.4, 1.23.4.5 PyShell.py, 1.81.4.1, 1.81.4.2 config-keys.def, 1.19, 1.19.8.1 configHandler.py, 1.31, 1.31.8.1 keybindingDialog.py, 1.11, 1.11.6.1
by kbk＠users.sourceforge.net 30 Mar '04

30 Mar '04

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32028 Modified Files: Tag: release23-maint 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 Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.23.4.4 retrieving revision 1.23.4.5 diff -C2 -d -r1.23.4.4 -r1.23.4.5 *** NEWS.txt 4 Dec 2003 20:44:28 -0000 1.23.4.4 --- NEWS.txt 30 Mar 2004 04:06:59 -0000 1.23.4.5 *************** *** 1,2 **** --- 1,11 ---- + What's New in IDLE 1.0.3? + =================================== + + *Release date: XX-XXX-2004* + + - 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 + What's New in IDLE 1.0.2? =================================== Index: PyShell.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/PyShell.py,v retrieving revision 1.81.4.1 retrieving revision 1.81.4.2 diff -C2 -d -r1.81.4.1 -r1.81.4.2 *** PyShell.py 14 Aug 2003 15:15:02 -0000 1.81.4.1 --- PyShell.py 30 Mar 2004 04:06:59 -0000 1.81.4.2 *************** *** 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.19.8.1 diff -C2 -d -r1.19 -r1.19.8.1 *** config-keys.def 18 May 2003 02:21:55 -0000 1.19 --- config-keys.def 30 Mar 2004 04:06:59 -0000 1.19.8.1 *************** *** 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.31.8.1 diff -C2 -d -r1.31 -r1.31.8.1 *** configHandler.py 27 Jan 2003 02:36:18 -0000 1.31 --- configHandler.py 30 Mar 2004 04:06:59 -0000 1.31.8.1 *************** *** 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.11.6.1 diff -C2 -d -r1.11 -r1.11.6.1 *** keybindingDialog.py 9 Jul 2003 18:48:24 -0000 1.11 --- keybindingDialog.py 30 Mar 2004 04:07:00 -0000 1.11.6.1 *************** *** 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/nondist/peps pep-0318.txt,1.6,1.7
by gvanrossum＠users.sourceforge.net 30 Mar '04

30 Mar '04

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29511 Modified Files: pep-0318.txt Log Message: Insert blank line to remove ReST warning/2. Index: pep-0318.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0318.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pep-0318.txt 25 Mar 2004 21:45:58 -0000 1.6 --- pep-0318.txt 30 Mar 2004 03:48:59 -0000 1.7 *************** *** 284,287 **** --- 284,288 ---- .. _PyProtocols: http://peak.telecommunity.com/PyProtocols.html + ::

1 0