Mailman 3 January 2004 - Python-checkins

python/dist/src/Doc/dist dist.tex,1.61,1.62
by fdrake＠users.sourceforge.net Jan. 23, 2004

Jan. 23, 2004

Update of /cvsroot/python/python/dist/src/Doc/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24460/dist Modified Files: dist.tex Log Message: no reason not to use boilerplate.tex now that it names the PSF Index: dist.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/dist/dist.tex,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** dist.tex 2 Jan 2004 06:57:49 -0000 1.61 --- dist.tex 23 Jan 2004 15:23:49 -0000 1.62 *************** *** 11,14 **** --- 11,16 ---- \title{Distributing Python Modules} + \input{boilerplate} + \author{Greg Ward} \authoraddress{

1 0

python/dist/src/Lib/idlelib PyShell.py,1.84,1.85
by kbk＠users.sourceforge.net Jan. 21, 2004

Jan. 21, 2004

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1:/tmp/cvs-serv29955 Modified Files: PyShell.py Log Message: There was an error in the Tk error dialog fix at Rev 1.84 which caused starting w/o the subprocess to fail. Check in a fix to IDLE and IDLEfork. M PyShell.py Backport candidate, combine with previous. Index: PyShell.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/PyShell.py,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** PyShell.py 21 Jan 2004 18:54:30 -0000 1.84 --- PyShell.py 21 Jan 2004 22:10:01 -0000 1.85 *************** *** 927,931 **** if not client: self.close() ! return None else: nosub = "==== No Subprocess ====" --- 927,931 ---- if not client: self.close() ! return False else: nosub = "==== No Subprocess ====" *************** *** 936,940 **** import Tkinter Tkinter._default_root = None # 03Jan04 KBK What's this? ! return client def readline(self): --- 936,940 ---- import Tkinter Tkinter._default_root = None # 03Jan04 KBK What's this? ! return True def readline(self):

1 0

python/dist/src/Lib/idlelib NEWS.txt, 1.29, 1.30 rpc.py, 1.27, 1.28
by kbk＠users.sourceforge.net Jan. 21, 2004

Jan. 21, 2004

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1:/tmp/cvs-serv20669 Modified Files: NEWS.txt rpc.py Log Message: rpc.py:SocketIO - Large modules were generating large pickles when downloaded to the execution server. The return of the OK response from the subprocess initialization was interfering and causing the sending socket to be not ready. Add an IO ready test to fix this. Moved the polling IO ready test into pollpacket(). M NEWS.txt M rpc.py Backport candidate. Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** NEWS.txt 21 Jan 2004 18:54:30 -0000 1.29 --- NEWS.txt 21 Jan 2004 19:21:11 -0000 1.30 *************** *** 4,7 **** --- 4,15 ---- *Release date: XX-XXX-2004* + - rpc.py:SocketIO - Large modules were generating large pickles when downloaded + to the execution server. The return of the OK response from the subprocess + initialization was interfering and causing the sending socket to be not + ready. Add an IO ready test to fix this. Moved the polling IO ready test + into pollpacket(). + + - Fix typo in rpc.py, s/b "pickle.PicklingError" not "pickle.UnpicklingError". + - 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: rpc.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/rpc.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** rpc.py 10 Sep 2003 02:42:18 -0000 1.27 --- rpc.py 21 Jan 2004 19:21:11 -0000 1.28 *************** *** 321,325 **** try: s = pickle.dumps(message) ! except pickle.UnpicklingError: print >>sys.__stderr__, "Cannot pickle:", `message` raise --- 321,325 ---- try: s = pickle.dumps(message) ! except pickle.PicklingError: print >>sys.__stderr__, "Cannot pickle:", `message` raise *************** *** 327,331 **** while len(s) > 0: try: ! n = self.sock.send(s) except (AttributeError, socket.error): # socket was closed --- 327,332 ---- while len(s) > 0: try: ! r, w, x = select.select([], [self.sock], []) ! n = self.sock.send(s[:BUFSIZE]) except (AttributeError, socket.error): # socket was closed *************** *** 334,341 **** s = s[n:] - def ioready(self, wait): - r, w, x = select.select([self.sock.fileno()], [], [], wait) - return len(r) - buffer = "" bufneed = 4 --- 335,338 ---- *************** *** 345,349 **** self._stage0() if len(self.buffer) < self.bufneed: ! if not self.ioready(wait): return None try: --- 342,347 ---- self._stage0() if len(self.buffer) < self.bufneed: ! r, w, x = select.select([self.sock.fileno()], [], [], wait) ! if len(r) == 0: return None try: *************** *** 378,382 **** try: message = pickle.loads(packet) ! except: print >>sys.__stderr__, "-----------------------" print >>sys.__stderr__, "cannot unpickle packet:", `packet` --- 376,380 ---- try: message = pickle.loads(packet) ! except pickle.UnpicklingError: print >>sys.__stderr__, "-----------------------" print >>sys.__stderr__, "cannot unpickle packet:", `packet`

1 0

python/dist/src/Lib/idlelib NEWS.txt, 1.28, 1.29 PyShell.py, 1.83, 1.84 ScriptBinding.py, 1.25, 1.26 run.py, 1.27, 1.28
by kbk＠users.sourceforge.net Jan. 21, 2004

Jan. 21, 2004

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1:/tmp/cvs-serv15527 Modified Files: NEWS.txt PyShell.py ScriptBinding.py run.py Log Message: 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 socket. Added Tk error dialogs to PyShell.py to announce a failure to bind the port or connect to the subprocess. Clean up error handling during connection initiation phase. This is an update of Python Patch 778323. M NEWS.txt M PyShell.py M ScriptBinding.py M run.py Backport candidate. Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** NEWS.txt 2 Jan 2004 04:04:04 -0000 1.28 --- NEWS.txt 21 Jan 2004 18:54:30 -0000 1.29 *************** *** 4,7 **** --- 4,13 ---- *Release date: XX-XXX-2004* + - 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 + socket. Added Tk error dialogs to PyShell.py to announce a failure to bind + the port or connect to the subprocess. Clean up error handling during + connection initiation phase. This is an update of Python Patch 778323. + - Print correct exception even if source file changed since shell was restarted. IDLEfork Patch 869012 Noam Raphael Index: PyShell.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/PyShell.py,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** PyShell.py 24 Nov 2003 05:26:16 -0000 1.83 --- PyShell.py 21 Jan 2004 18:54:30 -0000 1.84 *************** *** 252,256 **** else: self.pyshell = PyShell(self) ! self.pyshell.begin() return self.pyshell --- 252,258 ---- else: self.pyshell = PyShell(self) ! if self.pyshell: ! if not self.pyshell.begin(): ! return None return self.pyshell *************** *** 345,348 **** --- 347,353 ---- def start_subprocess(self): + # spawning first avoids passing a listening socket to the subprocess + self.spawn_subprocess() + #time.sleep(20) # test to simulate GUI not accepting connection addr = (LOCALHOST, self.port) # Idle starts listening for connection on localhost *************** *** 353,364 **** break except socket.error, err: ! print>>sys.__stderr__,"IDLE socket error: " + err[1]\ ! + ", retrying..." else: ! display_port_binding_error() ! sys.exit() ! self.spawn_subprocess() # Accept the connection from the Python execution server ! self.rpcclt.accept() self.rpcclt.register("stdin", self.tkconsole) self.rpcclt.register("stdout", self.tkconsole.stdout) --- 358,372 ---- break except socket.error, err: ! pass else: ! self.display_port_binding_error() ! return None # Accept the connection from the Python execution server ! self.rpcclt.listening_sock.settimeout(10) ! try: ! self.rpcclt.accept() ! except socket.timeout, err: ! self.display_no_subprocess_error() ! return None self.rpcclt.register("stdin", self.tkconsole) self.rpcclt.register("stdout", self.tkconsole.stdout) *************** *** 369,376 **** self.transfer_path() self.poll_subprocess() def restart_subprocess(self): if self.restarting: ! return self.restarting = True # close only the subprocess debugger --- 377,385 ---- self.transfer_path() self.poll_subprocess() + return self.rpcclt def restart_subprocess(self): if self.restarting: ! return self.rpcclt self.restarting = True # close only the subprocess debugger *************** *** 389,393 **** console.executing = False self.spawn_subprocess() ! self.rpcclt.accept() self.transfer_path() # annotate restart in shell window and mark it --- 398,406 ---- console.executing = False self.spawn_subprocess() ! try: ! self.rpcclt.accept() ! except socket.timeout, err: ! self.display_no_subprocess_error() ! return None self.transfer_path() # annotate restart in shell window and mark it *************** *** 408,411 **** --- 421,425 ---- debug.load_breakpoints() self.restarting = False + return self.rpcclt def __request_interrupt(self): *************** *** 416,420 **** def kill_subprocess(self): ! self.rpcclt.close() self.unix_terminate() self.tkconsole.executing = False --- 430,437 ---- def kill_subprocess(self): ! try: ! self.rpcclt.close() ! except AttributeError: # no socket ! pass self.unix_terminate() self.tkconsole.executing = False *************** *** 639,649 **** del c[key] - def display_executing_dialog(self): - tkMessageBox.showerror( - "Already executing", - "The Python Shell window is already executing a command; " - "please wait until it is finished.", - master=self.tkconsole.text) - def runcommand(self, code): "Run the code without invoking the debugger" --- 656,659 ---- *************** *** 696,699 **** --- 706,737 ---- self.tkconsole.stderr.write(s) + def display_port_binding_error(self): + tkMessageBox.showerror( + "Port Binding Error", + "IDLE can't bind TCP/IP port 8833, which is necessary to " + "communicate with its Python execution server. Either " + "no networking is installed on this computer or another " + "process (another IDLE?) is using the port. Run IDLE with the -n " + "command line switch to start without a subprocess and refer to " + "Help/IDLE Help 'Running without a subprocess' for further " + "details.", + master=self.tkconsole.text) + + def display_no_subprocess_error(self): + tkMessageBox.showerror( + "Subprocess Startup Error", + "IDLE's subprocess didn't make connection. Either IDLE can't " + "start a subprocess or personal firewall software is blocking " + "the connection.", + master=self.tkconsole.text) + + def display_executing_dialog(self): + tkMessageBox.showerror( + "Already executing", + "The Python Shell window is already executing a command; " + "please wait until it is finished.", + master=self.tkconsole.text) + + class PyShell(OutputWindow): *************** *** 766,771 **** # self.pollinterval = 50 # millisec - if use_subprocess: - self.interp.start_subprocess() reading = False --- 804,807 ---- *************** *** 888,891 **** --- 924,931 ---- if use_subprocess: nosub = '' + client = self.interp.start_subprocess() + if not client: + self.close() + return None else: nosub = "==== No Subprocess ====" *************** *** 895,903 **** self.showprompt() import Tkinter ! Tkinter._default_root = None ! ! def interact(self): ! self.begin() ! self.top.mainloop() def readline(self): --- 935,940 ---- self.showprompt() import Tkinter ! Tkinter._default_root = None # 03Jan04 KBK What's this? ! return client def readline(self): *************** *** 1282,1290 **** if not args: flist.new() ! if enable_shell: ! flist.open_shell() ! elif enable_shell: ! flist.pyshell = PyShell(flist) ! flist.pyshell.begin() shell = flist.pyshell # handle remaining options: --- 1319,1325 ---- if not args: flist.new() ! if enable_shell: ! if not flist.open_shell(): ! return # couldn't open shell shell = flist.pyshell # handle remaining options: *************** *** 1296,1300 **** if filename and os.path.isfile(filename): shell.interp.execfile(filename) ! if cmd or script: shell.interp.runcommand("""if 1: import sys as _sys --- 1331,1335 ---- if filename and os.path.isfile(filename): shell.interp.execfile(filename) ! if shell and cmd or script: shell.interp.runcommand("""if 1: import sys as _sys *************** *** 1310,1331 **** root.destroy() - - def display_port_binding_error(): - print """\ - \nIDLE cannot run. - - IDLE needs to use a specific TCP/IP port (8833) in order to communicate with - its Python execution server. IDLE is unable to bind to this port, and so - cannot start. Here are some possible causes of this problem: - - 1. TCP/IP networking is not installed or not working on this computer - 2. Another program (another IDLE?) is running that uses this port - 3. Personal firewall software is preventing IDLE from using this port - - Run IDLE with the -n command line switch to start without a subprocess - and refer to Help/IDLE Help "Running without a subprocess" for further - details. - """ - if __name__ == "__main__": sys.modules['PyShell'] = sys.modules['__main__'] --- 1345,1348 ---- Index: ScriptBinding.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/ScriptBinding.py,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** ScriptBinding.py 5 Jun 2003 02:38:32 -0000 1.25 --- ScriptBinding.py 21 Jan 2004 18:54:30 -0000 1.26 *************** *** 138,141 **** --- 138,143 ---- flist = self.editwin.flist shell = flist.open_shell() + if not shell: + return # couldn't open the shell interp = shell.interp if PyShell.use_subprocess: Index: run.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/run.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** run.py 2 Jan 2004 04:04:04 -0000 1.27 --- run.py 21 Jan 2004 18:54:30 -0000 1.28 *************** *** 48,51 **** --- 48,52 ---- no_exitfunc = del_exitfunc port = 8833 + #time.sleep(15) # test subprocess not responding if sys.argv[1:]: port = int(sys.argv[1]) *************** *** 91,95 **** def manage_socket(address): ! for i in range(6): time.sleep(i) try: --- 92,96 ---- def manage_socket(address): ! for i in range(3): time.sleep(i) try: *************** *** 97,107 **** break except socket.error, err: ! if i < 3: ! print>>sys.__stderr__, ".. ", ! else: ! print>>sys.__stderr__,"\nPython subprocess socket error: "\ ! + err[1] + ", retrying...." else: ! print>>sys.__stderr__, "\nConnection to Idle failed, exiting." global exit_now exit_now = True --- 98,107 ---- break except socket.error, err: ! print>>sys.__stderr__,"IDLE Subprocess: socket error: "\ ! + err[1] + ", retrying...." else: ! print>>sys.__stderr__, "IDLE Subprocess: Connection to "\ ! "IDLE GUI failed, exiting." ! show_socket_error(err, address) global exit_now exit_now = True *************** *** 109,112 **** --- 109,127 ---- server.handle_request() # A single request only + def show_socket_error(err, address): + import Tkinter + import tkMessageBox + root = Tkinter.Tk() + root.withdraw() + if err[0] == 61: # connection refused + msg = "IDLE's subprocess can't connect to %s:%d. This may be due "\ + "to your personal firewall configuration. It is safe to "\ + "allow this internal connection because no data is visible on "\ + "external ports." % address + tkMessageBox.showerror("IDLE Subprocess Error", msg, parent=root) + else: + tkMessageBox.showerror("IDLE Subprocess Error", "Socket Error: %s" % err[1]) + root.destroy() + def print_exception(): import linecache *************** *** 117,121 **** sys.last_type, sys.last_value, sys.last_traceback = excinfo tbe = traceback.extract_tb(tb) ! print >>efile, '\nTraceback (most recent call last):' exclude = ("run.py", "rpc.py", "threading.py", "Queue.py", "RemoteDebugger.py", "bdb.py") --- 132,136 ---- sys.last_type, sys.last_value, sys.last_traceback = excinfo tbe = traceback.extract_tb(tb) ! print>>efile, '\nTraceback (most recent call last):' exclude = ("run.py", "rpc.py", "threading.py", "Queue.py", "RemoteDebugger.py", "bdb.py")

1 0

python/dist/src/Doc/lib libdifflib.tex, 1.15, 1.15.10.1
by fdrake＠users.sourceforge.net Jan. 21, 2004

Jan. 21, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv10042 Modified Files: Tag: release23-maint libdifflib.tex Log Message: add direct link to the article in DDJ closes SF bug #871402 Index: libdifflib.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libdifflib.tex,v retrieving revision 1.15 retrieving revision 1.15.10.1 diff -C2 -d -r1.15 -r1.15.10.1 *** libdifflib.tex 11 Jun 2003 07:50:44 -0000 1.15 --- libdifflib.tex 21 Jan 2004 18:31:16 -0000 1.15.10.1 *************** *** 237,241 **** \begin{seealso} ! \seetitle{Pattern Matching: The Gestalt Approach}{Discussion of a similar algorithm by John W. Ratcliff and D. E. Metzener. This was published in --- 237,242 ---- \begin{seealso} ! \seetitle[http://www.ddj.com/documents/s=1103/ddj8807c/] ! {Pattern Matching: The Gestalt Approach}{Discussion of a similar algorithm by John W. Ratcliff and D. E. Metzener. This was published in

1 0

python/dist/src/Doc/lib libdifflib.tex,1.16,1.17
by fdrake＠users.sourceforge.net Jan. 21, 2004

Jan. 21, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv9843 Modified Files: libdifflib.tex Log Message: add direct link to the article in DDJ closes SF bug #871402 Index: libdifflib.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libdifflib.tex,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** libdifflib.tex 30 Dec 2003 16:12:27 -0000 1.16 --- libdifflib.tex 21 Jan 2004 18:30:28 -0000 1.17 *************** *** 235,239 **** \begin{seealso} ! \seetitle{Pattern Matching: The Gestalt Approach}{Discussion of a similar algorithm by John W. Ratcliff and D. E. Metzener. This was published in --- 235,240 ---- \begin{seealso} ! \seetitle[http://www.ddj.com/documents/s=1103/ddj8807c/] ! {Pattern Matching: The Gestalt Approach}{Discussion of a similar algorithm by John W. Ratcliff and D. E. Metzener. This was published in

1 0

python/nondist/peps pep-0306.txt,1.4,1.5
by mwh＠users.sourceforge.net Jan. 21, 2004

Jan. 21, 2004

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv5664 Modified Files: pep-0306.txt Log Message: add need for documentation. Index: pep-0306.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0306.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pep-0306.txt 10 Feb 2003 14:54:10 -0000 1.4 --- pep-0306.txt 21 Jan 2004 18:11:25 -0000 1.5 *************** *** 61,64 **** --- 61,66 ---- gratefully received. + __ Documentation must be written! + References

1 0

python/nondist/sandbox/setobj automata.py, 1.2, NONE cube.py, 1.2, NONE setobject.c, 1.24, NONE setup.py, 1.1, NONE test_set.py, 1.22, NONE
by rhettinger＠users.sourceforge.net Jan. 21, 2004

Jan. 21, 2004

Update of /cvsroot/python/python/nondist/sandbox/setobj In directory sc8-pr-cvs1:/tmp/cvs-serv1678/setobj Removed Files: automata.py cube.py setobject.c setup.py test_set.py Log Message: Cleanup old sandbox work. --- automata.py DELETED --- --- cube.py DELETED --- --- setobject.c DELETED --- --- setup.py DELETED --- --- test_set.py DELETED ---

1 0

python/dist/src/Doc/lib libcsv.tex, 1.7.8.2, 1.7.8.3
by montanaro＠users.sourceforge.net Jan. 21, 2004

Jan. 21, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv13086a Modified Files: Tag: release23-maint libcsv.tex Log Message: backport some doc fixes Index: libcsv.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcsv.tex,v retrieving revision 1.7.8.2 retrieving revision 1.7.8.3 diff -C2 -d -r1.7.8.2 -r1.7.8.3 *** libcsv.tex 10 Sep 2003 18:57:04 -0000 1.7.8.2 --- libcsv.tex 21 Jan 2004 13:49:43 -0000 1.7.8.3 *************** *** 229,233 **** \begin{memberdesc}[Dialect]{doublequote} Controls how instances of \var{quotechar} appearing inside a field should be ! themselves be quoted. When \constant{True}, the character is doubledd. When \constant{False}, the \var{escapechar} must be a one-character string which is used as a prefix to the \var{quotechar}. It defaults to --- 229,233 ---- \begin{memberdesc}[Dialect]{doublequote} Controls how instances of \var{quotechar} appearing inside a field should be ! themselves be quoted. When \constant{True}, the character is doubled. When \constant{False}, the \var{escapechar} must be a one-character string which is used as a prefix to the \var{quotechar}. It defaults to *************** *** 275,280 **** \subsection{Writer Objects} ! Writer objects (\class{DictWriter} instances and objects returned by ! the \function{writer()} function) have the following public methods: \begin{methoddesc}[csv writer]{writerow}{row} --- 275,286 ---- \subsection{Writer Objects} ! \class{Writer} objects (\class{DictWriter} instances and objects returned by ! the \function{writer()} function) have the following public methods. A ! {}\var{row} must be a sequence of strings or numbers for \class{Writer} ! objects and a dictionary mapping fieldnames to strings or numbers (by ! passing them through \function{str()} first) for {}\class{DictWriter} ! objects. Note that complex numbers are written out surrounded by parens. ! This may cause some problems for other programs which read CSV files ! (assuming they support complex numbers at all). \begin{methoddesc}[csv writer]{writerow}{row} *************** *** 284,288 **** \begin{methoddesc}[csv writer]{writerows}{rows} ! Write all the \var{rows} parameters to the writer's file object, formatted according to the current dialect. \end{methoddesc} --- 290,295 ---- \begin{methoddesc}[csv writer]{writerows}{rows} ! Write all the \var{rows} parameters (a list of \var{row} objects as ! described above) to the writer's file object, formatted according to the current dialect. \end{methoddesc}

1 0

python/dist/src/Doc/lib libcsv.tex,1.11,1.12
by montanaro＠users.sourceforge.net Jan. 21, 2004

Jan. 21, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv12613 Modified Files: libcsv.tex Log Message: expand on notion of row object type Index: libcsv.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libcsv.tex,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** libcsv.tex 21 Jan 2004 13:34:35 -0000 1.11 --- libcsv.tex 21 Jan 2004 13:47:04 -0000 1.12 *************** *** 286,291 **** \subsection{Writer Objects} ! Writer objects (\class{DictWriter} instances and objects returned by ! the \function{writer()} function) have the following public methods: \begin{methoddesc}[csv writer]{writerow}{row} --- 286,297 ---- \subsection{Writer Objects} ! \class{Writer} objects (\class{DictWriter} instances and objects returned by ! the \function{writer()} function) have the following public methods. A ! {}\var{row} must be a sequence of strings or numbers for \class{Writer} ! objects and a dictionary mapping fieldnames to strings or numbers (by ! passing them through \function{str()} first) for {}\class{DictWriter} ! objects. Note that complex numbers are written out surrounded by parens. ! This may cause some problems for other programs which read CSV files ! (assuming they support complex numbers at all). \begin{methoddesc}[csv writer]{writerow}{row} *************** *** 295,299 **** \begin{methoddesc}[csv writer]{writerows}{rows} ! Write all the \var{rows} parameters to the writer's file object, formatted according to the current dialect. \end{methoddesc} --- 301,306 ---- \begin{methoddesc}[csv writer]{writerows}{rows} ! Write all the \var{rows} parameters (a list of \var{row} objects as ! described above) to the writer's file object, formatted according to the current dialect. \end{methoddesc}

1 0