Mailman 3 December 2004 - Python-checkins

python/dist/src/Doc/mac using.tex,1.12,1.13
by bcannon＠users.sourceforge.net Dec. 24, 2004

Dec. 24, 2004

Update of /cvsroot/python/python/dist/src/Doc/mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13073/Doc/mac Modified Files: using.tex Log Message: Fix sentence stating TextEdit only saves in RTF; can save in plaintext as well. Closes bug #1085300. Thanks unclewalrus. Index: using.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/mac/using.tex,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- using.tex 2 Oct 2004 11:02:58 -0000 1.12 +++ using.tex 24 Dec 2004 02:40:59 -0000 1.13 @@ -62,8 +62,8 @@ (see \url{http://www.barebones.com/products/bbedit/index.shtml}) are good choices. Their freeware \program{BBEdit Lite} is officially discontinued but still available. \program{AppleWorks} or any other -word processor that can save files in ASCII is also a possibility, but -\program{TextEdit} is not: it saves in \file{.rtf} format only. +word processor that can save files in ASCII is also a possibility, including +\program{TextEdit} which is included with OS X. To run your script from the Terminal window you must make sure that \file{/usr/local/bin} is in your shell search path before \file{/usr/bin},

1 0

python/dist/src/Objects object.c,2.224,2.225
by arigo＠users.sourceforge.net Dec. 23, 2004

Dec. 23, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21400/Objects Modified Files: object.c Log Message: Dima Dorfman's patch for coercion/comparison of C types (patch #995939), with a minor change after the coercion, to accept two objects not necessarily of the same type but with the same tp_compare. Index: object.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/object.c,v retrieving revision 2.224 retrieving revision 2.225 diff -u -d -r2.224 -r2.225 --- object.c 25 Sep 2004 01:37:24 -0000 2.224 +++ object.c 23 Dec 2004 22:13:13 -0000 2.225 @@ -606,33 +606,28 @@ w->ob_type->tp_compare == _PyObject_SlotCompare) return _PyObject_SlotCompare(v, w); - /* Try coercion; if it fails, give up */ + /* If we're here, v and w, + a) are not instances; + b) have different types or a type without tp_compare; and + c) don't have a user-defined tp_compare. + tp_compare implementations in C assume that both arguments + have their type, so we give up if the coercion fails or if + it yields types which are still incompatible (which can + happen with a user-defined nb_coerce). + */ c = PyNumber_CoerceEx(&v, &w); if (c < 0) return -2; if (c > 0) return 2; - - /* Try v's comparison, if defined */ - if ((f = v->ob_type->tp_compare) != NULL) { + f = v->ob_type->tp_compare; + if (f != NULL && f == w->ob_type->tp_compare) { c = (*f)(v, w); Py_DECREF(v); Py_DECREF(w); return adjust_tp_compare(c); } - /* Try w's comparison, if defined */ - if ((f = w->ob_type->tp_compare) != NULL) { - c = (*f)(w, v); /* swapped! */ - Py_DECREF(v); - Py_DECREF(w); - c = adjust_tp_compare(c); - if (c >= -1) - return -c; /* Swapped! */ - else - return c; - } - /* No comparison defined */ Py_DECREF(v); Py_DECREF(w);

1 0

python/dist/src/Lib/test test_coercion.py, 1.7, 1.8
by arigo＠users.sourceforge.net Dec. 23, 2004

Dec. 23, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21400/Lib/test Modified Files: test_coercion.py Log Message: Dima Dorfman's patch for coercion/comparison of C types (patch #995939), with a minor change after the coercion, to accept two objects not necessarily of the same type but with the same tp_compare. Index: test_coercion.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_coercion.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- test_coercion.py 10 Mar 2004 17:30:03 -0000 1.7 +++ test_coercion.py 23 Dec 2004 22:13:13 -0000 1.8 @@ -125,9 +125,45 @@ else: print '=', format_result(x) +# New-style class version of CoerceNumber +class CoerceTo(object): + def __init__(self, arg): + self.arg = arg + def __coerce__(self, other): + if isinstance(other, CoerceTo): + return self.arg, other.arg + else: + return self.arg, other + +def assert_(expr, msg=None): + if not expr: + raise AssertionError, msg + +def do_cmptypes(): + # Built-in tp_compare slots expect their arguments to have the + # same type, but a user-defined __coerce__ doesn't have to obey. + # SF #980352 + evil_coercer = CoerceTo(42) + # Make sure these don't crash any more + assert_(cmp(u'fish', evil_coercer) != 0) + assert_(cmp(slice(1), evil_coercer) != 0) + # ...but that this still works + class WackyComparer(object): + def __cmp__(self, other): + assert_(other == 42, 'expected evil_coercer, got %r' % other) + return 0 + assert_(cmp(WackyComparer(), evil_coercer) == 0) + # ...and classic classes too, since that code path is a little different + class ClassicWackyComparer: + def __cmp__(self, other): + assert_(other == 42, 'expected evil_coercer, got %r' % other) + return 0 + assert_(cmp(ClassicWackyComparer(), evil_coercer) == 0) + warnings.filterwarnings("ignore", r'complex divmod, // and % are deprecated', DeprecationWarning, r'test.test_coercion$') do_infix_binops() do_prefix_binops() +do_cmptypes()

1 0

python/dist/src/Doc/lib libbltin.tex, 1.8, 1.8.52.1
by fdrake＠users.sourceforge.net Dec. 23, 2004

Dec. 23, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16308/lib Modified Files: Tag: release24-maint libbltin.tex Log Message: discuss how the __builtin__ module is normally used, and try to clarify the difference between __builtins__ and __builtin__ (based on an email comment) (backported from trunk revision 1.9) Index: libbltin.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libbltin.tex,v retrieving revision 1.8 retrieving revision 1.8.52.1 diff -u -d -r1.8 -r1.8.52.1 --- libbltin.tex 23 Apr 1999 17:11:53 -0000 1.8 +++ libbltin.tex 23 Dec 2004 16:55:32 -0000 1.8.52.1 @@ -1,11 +1,44 @@ \section{\module{__builtin__} --- - Built-in functions} + Built-in objects} \declaremodule[builtin]{builtin}{__builtin__} -\modulesynopsis{The set of built-in functions.} +\modulesynopsis{The module that provides the built-in namespace.} This module provides direct access to all `built-in' identifiers of -Python; e.g. \code{__builtin__.open} is the full name for the built-in -function \function{open()}. See section \ref{built-in-funcs}, ``Built-in -Functions.'' +Python; for example, \code{__builtin__.open} is the full name for the +built-in function \function{open()}. See chapter~\ref{builtin}, +``Built-in Objects.'' + +This module is not normally accessed explicitly by most applications, +but can be useful in modules that provide objects with the same name +as a built-in value, but in which the built-in of that name is also +needed. For example, in a module that wants to implement an +\function{open()} function that wraps the built-in \function{open()}, +this module can be used directly: + +\begin{verbatim} +import __builtin__ + +def open(path): + f = __builtin__.open(path, 'r') + return UpperCaser(f) + +class UpperCaser: + '''Wrapper around a file that converts output to upper-case.''' + + def __init__(self, f): + self._f = f + + def read(self, count=-1): + return self._f.read(count).upper() + + # ... +\end{verbatim} + +As an implementation detail, most modules have the name +\code{__builtins__} (note the \character{s}) made available as part of +their globals. The value of \code{__builtins__} is normally either +this module or the value of this modules's \member{__dict__} +attribute. Since this is an implementation detail, it may not be used +by alternate implementations of Python.

1 0

python/dist/src/Doc/lib libbltin.tex,1.8,1.9
by fdrake＠users.sourceforge.net Dec. 23, 2004

Dec. 23, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15156/lib Modified Files: libbltin.tex Log Message: discuss how the __builtin__ module is normally used, and try to clarify the difference between __builtins__ and __builtin__ (based on an email comment) Index: libbltin.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libbltin.tex,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- libbltin.tex 23 Apr 1999 17:11:53 -0000 1.8 +++ libbltin.tex 23 Dec 2004 16:50:36 -0000 1.9 @@ -1,11 +1,44 @@ \section{\module{__builtin__} --- - Built-in functions} + Built-in objects} \declaremodule[builtin]{builtin}{__builtin__} -\modulesynopsis{The set of built-in functions.} +\modulesynopsis{The module that provides the built-in namespace.} This module provides direct access to all `built-in' identifiers of -Python; e.g. \code{__builtin__.open} is the full name for the built-in -function \function{open()}. See section \ref{built-in-funcs}, ``Built-in -Functions.'' +Python; for example, \code{__builtin__.open} is the full name for the +built-in function \function{open()}. See chapter~\ref{builtin}, +``Built-in Objects.'' + +This module is not normally accessed explicitly by most applications, +but can be useful in modules that provide objects with the same name +as a built-in value, but in which the built-in of that name is also +needed. For example, in a module that wants to implement an +\function{open()} function that wraps the built-in \function{open()}, +this module can be used directly: + +\begin{verbatim} +import __builtin__ + +def open(path): + f = __builtin__.open(path, 'r') + return UpperCaser(f) + +class UpperCaser: + '''Wrapper around a file that converts output to upper-case.''' + + def __init__(self, f): + self._f = f + + def read(self, count=-1): + return self._f.read(count).upper() + + # ... +\end{verbatim} + +As an implementation detail, most modules have the name +\code{__builtins__} (note the \character{s}) made available as part of +their globals. The value of \code{__builtins__} is normally either +this module or the value of this modules's \member{__dict__} +attribute. Since this is an implementation detail, it may not be used +by alternate implementations of Python.

1 0

python/dist/src/Doc/lib libobjs.tex,1.11,1.12
by fdrake＠users.sourceforge.net Dec. 23, 2004

Dec. 23, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9233 Modified Files: libobjs.tex Log Message: fix weird capitalization of "built-in" Index: libobjs.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libobjs.tex,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- libobjs.tex 1 Jan 2003 20:37:14 -0000 1.11 +++ libobjs.tex 23 Dec 2004 16:22:45 -0000 1.12 @@ -1,4 +1,4 @@ -\chapter{Built-In Objects \label{builtin}} +\chapter{Built-in Objects \label{builtin}} Names for built-in exceptions and functions and a number of constants are found in a separate

1 0

python/dist/src/Lib/idlelib rpc.py,1.30,1.31
by kbk＠users.sourceforge.net Dec. 23, 2004

Dec. 23, 2004

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17234 Modified Files: rpc.py Log Message: Improve error message if rpc'l localcall() fails with unexpected exception. Index: rpc.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/rpc.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- rpc.py 21 Dec 2004 22:10:32 -0000 1.30 +++ rpc.py 23 Dec 2004 04:39:55 -0000 1.31 @@ -199,7 +199,9 @@ except socket.error: raise except: - self.debug("localcall:EXCEPTION") + msg = "*** Internal Error: rpc.py:SocketIO.localcall()\n\n"\ + " Object: %s \n Method: %s \n Args: %s\n" + print>>sys.__stderr__, msg % (oid, method, args) traceback.print_exc(file=sys.__stderr__) return ("EXCEPTION", None)

1 0

python/dist/src/Lib/idlelib idlever.py, 1.15.4.4, 1.15.4.5
by kbk＠users.sourceforge.net Dec. 23, 2004

Dec. 23, 2004

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15758 Modified Files: Tag: release23-maint idlever.py Log Message: Bump idle version. Index: idlever.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/idlever.py,v retrieving revision 1.15.4.4 retrieving revision 1.15.4.5 diff -u -d -r1.15.4.4 -r1.15.4.5 --- idlever.py 6 Jun 2004 17:41:41 -0000 1.15.4.4 +++ idlever.py 23 Dec 2004 04:33:50 -0000 1.15.4.5 @@ -1 +1 @@ -IDLE_VERSION = "1.0.4" +IDLE_VERSION = "1.0.5"

1 0

python/dist/src/Lib/idlelib NEWS.txt, 1.49, 1.49.2.1 PyShell.py, 1.92, 1.92.2.1 idlever.py, 1.22, 1.22.2.1
by kbk＠users.sourceforge.net Dec. 23, 2004

Dec. 23, 2004

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15234 Modified Files: Tag: release24-maint NEWS.txt PyShell.py idlever.py Log Message: 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 M NEWS.txt M PyShell.py M idlever.py Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.49 retrieving revision 1.49.2.1 diff -u -d -r1.49 -r1.49.2.1 --- NEWS.txt 30 Nov 2004 01:28:55 -0000 1.49 +++ NEWS.txt 23 Dec 2004 04:32:25 -0000 1.49.2.1 @@ -1,3 +1,12 @@ +What's New in IDLE 1.1.1? +======================= + +*Release date: XX-DEC-2004* + +- 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 + What's New in IDLE 1.1? ======================= Index: PyShell.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/PyShell.py,v retrieving revision 1.92 retrieving revision 1.92.2.1 diff -u -d -r1.92 -r1.92.2.1 --- PyShell.py 13 Nov 2004 21:05:58 -0000 1.92 +++ PyShell.py 23 Dec 2004 04:32:25 -0000 1.92.2.1 @@ -910,6 +910,9 @@ parent=self.text) if response == False: return "cancel" + if self.reading: + self.top.quit() + self.canceled = True self.closing = True # Wait for poll_subprocess() rescheduling to stop self.text.after(2 * self.pollinterval, self.close2) @@ -974,10 +977,12 @@ save = self.reading try: self.reading = 1 - self.top.mainloop() + self.top.mainloop() # nested mainloop() finally: self.reading = save line = self.text.get("iomark", "end-1c") + if len(line) == 0: # may be EOF if we quit our mainloop with Ctrl-C + line = "\n" if isinstance(line, unicode): import IOBinding try: @@ -987,10 +992,11 @@ self.resetoutput() if self.canceled: self.canceled = 0 - raise KeyboardInterrupt + if not use_subprocess: + raise KeyboardInterrupt if self.endoffile: self.endoffile = 0 - return "" + line = "" return line def isatty(self): @@ -1009,13 +1015,13 @@ return "break" self.endoffile = 0 self.canceled = 1 - if self.reading: - self.top.quit() - elif (self.executing and self.interp.rpcclt): + if (self.executing and self.interp.rpcclt): if self.interp.getdebugger(): self.interp.restart_subprocess() else: self.interp.interrupt_subprocess() + if self.reading: + self.top.quit() # exit the nested mainloop() in readline() return "break" def eof_callback(self, event): Index: idlever.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/idlever.py,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -u -d -r1.22 -r1.22.2.1 --- idlever.py 29 Nov 2004 01:40:31 -0000 1.22 +++ idlever.py 23 Dec 2004 04:32:25 -0000 1.22.2.1 @@ -1 +1 @@ -IDLE_VERSION = "1.1" +IDLE_VERSION = "1.1.1"

1 0

python/dist/src/Lib/idlelib NEWS.txt, 1.23.4.8, 1.23.4.9 PyShell.py, 1.81.4.4, 1.81.4.5
by kbk＠users.sourceforge.net Dec. 23, 2004

Dec. 23, 2004

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13532 Modified Files: Tag: release23-maint NEWS.txt PyShell.py Log Message: 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 M NEWS.txt M PyShell.py Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.23.4.8 retrieving revision 1.23.4.9 diff -u -d -r1.23.4.8 -r1.23.4.9 --- NEWS.txt 6 Jun 2004 17:41:41 -0000 1.23.4.8 +++ NEWS.txt 23 Dec 2004 04:26:55 -0000 1.23.4.9 @@ -1,7 +1,11 @@ What's New in IDLE 1.0.4? ========================= -*Release date: XX-XXX-2004* +*Release date: XX-Dec-2004* + +- 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 - Added a Tk error dialog to run.py inform the user if the subprocess can't connect to the user GUI process. Added a timeout to the GUI's listening Index: PyShell.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/PyShell.py,v retrieving revision 1.81.4.4 retrieving revision 1.81.4.5 diff -u -d -r1.81.4.4 -r1.81.4.5 --- PyShell.py 22 Sep 2004 04:52:33 -0000 1.81.4.4 +++ PyShell.py 23 Dec 2004 04:26:55 -0000 1.81.4.5 @@ -877,6 +877,9 @@ parent=self.text) if response == False: return "cancel" + if self.reading: + self.top.quit() + self.canceled = True self.closing = True # Wait for poll_subprocess() rescheduling to stop self.text.after(2 * self.pollinterval, self.close2) @@ -941,10 +944,12 @@ save = self.reading try: self.reading = 1 - self.top.mainloop() + self.top.mainloop() # nested mainloop() finally: self.reading = save line = self.text.get("iomark", "end-1c") + if len(line) == 0: # may be EOF if we quit our mainloop with Ctrl-C + line = "\n" if isinstance(line, unicode): import IOBinding try: @@ -954,10 +959,11 @@ self.resetoutput() if self.canceled: self.canceled = 0 - raise KeyboardInterrupt + if not use_subprocess: + raise KeyboardInterrupt if self.endoffile: self.endoffile = 0 - return "" + line = "" return line def isatty(self): @@ -976,13 +982,13 @@ return "break" self.endoffile = 0 self.canceled = 1 - if self.reading: - self.top.quit() - elif (self.executing and self.interp.rpcclt): + if (self.executing and self.interp.rpcclt): if self.interp.getdebugger(): self.interp.restart_subprocess() else: self.interp.interrupt_subprocess() + if self.reading: + self.top.quit() # exit the nested mainloop() in readline() return "break" def eof_callback(self, event):

1 0