From fdrake@weyr.cnri.reston.va.us  Tue Feb  1 03:48:58 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 31 Jan 2000 22:48:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcode.tex,1.9,1.9.4.1 libcodeop.tex,1.1,1.1.2.1
Message-ID: <200002010348.WAA16800@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libcode.tex libcodeop.tex 
Log Message:
Update descriptions.

For the code module, add information about the interpreter base classes,
since that's what is really interesting here.


Index: libcode.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libcode.tex,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -C2 -r1.9 -r1.9.4.1
*** libcode.tex	1999/01/27 15:48:23	1.9
--- libcode.tex	2000/02/01 03:48:54	1.9.4.1
***************
*** 1,30 ****
  \section{\module{code} ---
!          Code object services.}
  \declaremodule{standard}{code}
  
! \modulesynopsis{Code object services.}
  
  
! The \code{code} module defines operations pertaining to Python code
! objects.  It defines the following function:
! 
  
! \begin{funcdesc}{compile_command}{source, \optional{filename\optional{, symbol}}}
  This function is useful for programs that want to emulate Python's
  interpreter main loop (a.k.a. the read-eval-print loop).  The tricky
  part is to determine when the user has entered an incomplete command
! that can be completed by entering more text (as opposed to a complete
! command or a syntax error).  This function \emph{almost} always makes
! the same decision as the real interpreter main loop.
! 
! Arguments: \var{source} is the source string; \var{filename} is the
! optional filename from which source was read, defaulting to
! \code{'<input>'}; and \var{symbol} is the optional grammar start
! symbol, which should be either \code{'single'} (the default) or
! \code{'eval'}.
! 
! Return a code object (the same as \code{compile(\var{source},
! \var{filename}, \var{symbol})}) if the command is complete and valid;
! return \code{None} if the command is incomplete; raise
! \exception{SyntaxError} if the command is a syntax error.
  \end{funcdesc}
--- 1,173 ----
  \section{\module{code} ---
!          Interpreter base classes}
  \declaremodule{standard}{code}
  
! \modulesynopsis{Base classes for interactive Python interpreters.}
  
  
! The \code{code} module provides facilities to implement
! read-eval-print loops in Python.  Two classes and convenience
! functions are included which can be used to build applications which
! provide an interactive interpreter prompt.
! 
! 
! \begin{classdesc}{InteractiveInterpreter}{\optional{locals}}
! This class deals with parsing and interpreter state (the user's
! namespace); it does not deal with input buffering or prompting or
! input file naming (the filename is always passed in explicitly).
! The optional \var{locals} argument specifies the dictionary in
! which code will be executed; it defaults to a newly created
! dictionary with key \code{'__name__'} set to \code{'__console__'}
! and key \code{'__doc__'} set to \code{None}.
! \end{classdesc}
! 
! \begin{classdesc}{InteractiveConsole}{\optional{locals\optional{, filename}}}
! Closely emulate the behavior of the interactive Python interpreter.
! This class builds on \class{InteractiveInterpreter} and adds
! prompting using the familiar \code{sys.ps1} and \code{sys.ps2}, and
! input buffering.
! \end{classdesc}
! 
! 
! \begin{funcdesc}{interact}{\optional{banner\optional{,
!                            readfunc\optional{, local}}}}
! Convenience function to run a read-eval-print loop.  This creates a
! new instance of \class{InteractiveConsole} and sets \var{readfunc}
! to be used as the \method{raw_input()} method, if provided.  If
! \var{local} is provided, it is passed to the
! \class{InteractiveConsole} constructor for use as the default
! namespace for the interpreter loop.  The \method{interact()} method
! of the instance is then run with \var{banner} passed as the banner
! to use, if provided.  The console object is discarded after use.
! \end{funcdesc}
  
! \begin{funcdesc}{compile_command}{source\optional{,
!                                   filename\optional{, symbol}}}
  This function is useful for programs that want to emulate Python's
  interpreter main loop (a.k.a. the read-eval-print loop).  The tricky
  part is to determine when the user has entered an incomplete command
! that can be completed by entering more text (as opposed to a
! complete command or a syntax error).  This function
! \emph{almost} always makes the same decision as the real interpreter
! main loop.
! 
! \var{source} is the source string; \var{filename} is the optional
! filename from which source was read, defaulting to \code{'<input>'};
! and \var{symbol} is the optional grammar start symbol, which should
! be either \code{'single'} (the default) or \code{'eval'}.
! 
! Returns a code object (the same as \code{compile(\var{source},
! \var{filename}, \var{symbol})}) if the command is complete and
! valid; \code{None} if the command is incomplete; raises
! \exception{SyntaxError} if the command is complete and contains a
! syntax error, or raises \exception{OverflowError} if the command
! includes a numeric constant which exceeds the range of the
! appropriate numeric type.
  \end{funcdesc}
+ 
+ 
+ \subsection{Interactive Interpreter Objects
+             \label{interpreter-objects}}
+ 
+ \begin{methoddesc}{runsource}{source\optional{, filename\optional{, symbol}}}
+ Compile and run some source in the interpreter.
+ Arguments are the same as for \function{compile_command()}; the
+ default for \var{filename} is \code{'<input>'}, and for
+ \var{symbol} is \code{'single'}.  One several things can happen:
+ 
+ \begin{itemize}
+ \item
+ The input is incorrect; \function{compile_command()} raised an
+ exception (\exception{SyntaxError} or \exception{OverflowError}).  A
+ syntax traceback will be printed by calling the
+ \method{showsyntaxerror()} method.  \method{runsource()} returns
+ \code{0}.
+ 
+ \item
+ The input is incomplete, and more input is required;
+ \function{compile_command()} returned \code{None}.
+ \method{runsource()} returns \code{1}.
+ 
+ \item
+ The input is complete; \function{compile_command()} returned a code
+ object.  The code is executed by calling the \method{runcode()} (which
+ also handles run-time exceptions, except for \exception{SystemExit}).
+ \method{runsource()} returns \code{0}.
+ \end{itemize}
+ 
+ The return value can be used to decide whether to use
+ \code{sys.ps1} or \code{sys.ps2} to prompt the next line.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{runcode}{code}
+ Execute a code object.
+ When an exception occurs, \method{showtraceback()} is called to
+ display a traceback.  All exceptions are caught except
+ \exception{SystemExit}, which is allowed to propogate.
+ 
+ A note about \exception{KeyboardInterrupt}: this exception may occur
+ elsewhere in this code, and may not always be caught.  The caller
+ should be prepared to deal with it.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{showsyntaxerror}{\optional{filename}}
+ Display the syntax error that just occurred.  This does not display
+ a stack trace because there isn't one for syntax errors.
+ If \var{filename} is given, it is stuffed into the exception instead
+ of the default filename provided by Python's parser, because it
+ always uses \code{'<string>'} when reading from a string.
+ The output is written by the \method{write()} method.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{showtraceback}{}
+ Display the exception that just occurred.  We remove the first stack
+ item because it is within the interpreter object implementation.
+ The output is written by the \method{write()} method.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{write}{data}
+ Write a string to standard output.  Derived classes should override
+ this to provide the appropriate output handling as needed.
+ \end{methoddesc}
+ 
+ 
+ \subsection{Interactive Console Objects
+             \label{console-objects}}
+ 
+ The \class{InteractiveConsole} class is a subclass of
+ \class{InteractiveInterpreter}, and so offers all the methods of the
+ interpreter objects as well as the following additions.
+ 
+ \begin{methoddesc}{interact}{\optional{banner}}
+ Closely emulate the interactive Python console.
+ The optional banner argument specify the banner to print before the
+ first interaction; by default it prints a banner similar to the one
+ printed by the standard Python interpreter, followed by the class
+ name of the console object in parentheses (so as not to confuse this
+ with the real interpreter -- since it's so close!).
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{push}{line}
+ Push a line of source text to the interpreter.
+ The line should not have a trailing newline; it may have internal
+ newlines.  The line is appended to a buffer and the interpreter's
+ \method{runsource()} method is called with the concatenated contents
+ of the buffer as source.  If this indicates that the command was
+ executed or invalid, the buffer is reset; otherwise, the command is
+ incomplete, and the buffer is left as it was after the line was
+ appended.  The return value is \code{1} if more input is required,
+ \code{0} if the line was dealt with in some way (this is the same as
+ \method{runsource()}).
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{resetbuffer}{}
+ Remove any unhandled source text from the input buffer.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{raw_input}{\optional{prompt}}
+ Write a prompt and read a line.  The returned line does not include
+ the trailing newline.  When the user enters the \EOF{} key sequence,
+ \exception{EOFError} is raised.  The base implementation uses the
+ built-in function \function{raw_input()}; a subclass may replace this
+ with a different implementation.
+ \end{methoddesc}

Index: libcodeop.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libcodeop.tex,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** libcodeop.tex	1999/06/23 13:33:40	1.1
--- libcodeop.tex	2000/02/01 03:48:54	1.1.2.1
***************
*** 1,6 ****
- % LaTeXed from excellent doc-string.
  \section{\module{codeop} ---
           Compile Python code}
  
  \declaremodule{standard}{codeop}
  \sectionauthor{Moshe Zadka}{mzadka@geocities.com}
--- 1,7 ----
  \section{\module{codeop} ---
           Compile Python code}
  
+ % LaTeXed from excellent doc-string.
+ 
  \declaremodule{standard}{codeop}
  \sectionauthor{Moshe Zadka}{mzadka@geocities.com}
***************
*** 8,12 ****
  
  The \module{codeop} module provides a function to compile Python code
! with hints on whether it certainly complete, possible complete or
  definitely incomplete.  This is used by the \refmodule{code} module
  and should not normally be used directly.
--- 9,13 ----
  
  The \module{codeop} module provides a function to compile Python code
! with hints on whether it is certainly complete, possibly complete or
  definitely incomplete.  This is used by the \refmodule{code} module
  and should not normally be used directly.
***************
*** 16,38 ****
  \begin{funcdesc}{compile_command}
                  {source\optional{, filename\optional{, symbol}}}
! 
! Try to compile \var{source}, which should be a string of Python
! code. Return a code object if \var{source} is valid
  Python code. In that case, the filename attribute of the code object
  will be \var{filename}, which defaults to \code{'<input>'}.
! 
! Return \code{None} if \var{source} is \emph{not} valid Python
  code, but is a prefix of valid Python code.
- 
- Raise an exception if there is a problem with \var{source}:
- \begin{itemize}
-         \item \exception{SyntaxError}
-               if there is invalid Python syntax.
-         \item \exception{OverflowError}
-               if there is an invalid numeric constant.
- \end{itemize}
  
! The \var{symbol} argument means whether to compile it as a statement
! (\code{'single'}, the default) or as an expression (\code{'eval'}).
  
  \strong{Caveat:}
--- 17,36 ----
  \begin{funcdesc}{compile_command}
                  {source\optional{, filename\optional{, symbol}}}
! Tries to compile \var{source}, which should be a string of Python
! code and return a code object if \var{source} is valid
  Python code. In that case, the filename attribute of the code object
  will be \var{filename}, which defaults to \code{'<input>'}.
! Returns \code{None} if \var{source} is \emph{not} valid Python
  code, but is a prefix of valid Python code.
  
! If there is a problem with \var{source}, an exception will be raised.
! \exception{SyntaxError} is raised if there is invalid Python syntax,
! and \exception{OverflowError} if there is an invalid numeric
! constant.
! 
! The \var{symbol} argument determines whether \var{source} is compiled
! as a statement (\code{'single'}, the default) or as an expression
! (\code{'eval'}).  Any other value will cause \exception{ValueError} to 
! be raised.
  
  \strong{Caveat:}



From fdrake@weyr.cnri.reston.va.us  Tue Feb  1 18:18:44 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 1 Feb 2000 13:18:44 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/html style.css,1.4.4.1,1.4.4.2
Message-ID: <200002011818.NAA18704@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/html
In directory weyr:/home/fdrake/projects/python/Doc-152p1/html

Modified Files:
      Tag: release152p1-patches
	style.css 
Log Message:

Don't name the Courier font; use monospace and let the browser apply
the best available font.  Based on a comment by Mauro Cicognini
<mcicogni@siosistemi.it>.

Added a couple of additional style rules for refcount information.


Index: style.css
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/html/style.css,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -r1.4.4.1 -r1.4.4.2
*** style.css	1999/12/21 15:59:38	1.4.4.1
--- style.css	2000/02/01 18:18:41	1.4.4.2
***************
*** 33,37 ****
  h2			{ font-size: 150% }
  h3, h4			{ font-size: 120% }
! code, tt		{ font-family: courier }
  var			{ font: italic normal serif }
  
--- 33,37 ----
  h2			{ font-size: 150% }
  h3, h4			{ font-size: 120% }
! code, tt		{ font-family: monospace }
  var			{ font: italic normal serif }
  
***************
*** 46,49 ****
--- 46,53 ----
  .url			{ font-family: avantgarde, sans-serif }
  .file			{ font-family: avantgarde, sans-serif }
+ 
+ .refcount-info          { font-style: italic }
+ .refcount-info .value   { font-weight: bold;
+                           color: #006600 }
  
  /*



From fdrake@weyr.cnri.reston.va.us  Tue Feb  1 19:06:43 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 1 Feb 2000 14:06:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/perl python.perl,1.65.2.2,1.65.2.3
Message-ID: <200002011906.OAA19183@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/perl
In directory weyr:/home/fdrake/projects/python/Doc-152p1/perl

Modified Files:
      Tag: release152p1-patches
	python.perl 
Log Message:

Added magic to read from api/refcounts.dat file to generate reference
count information for return values, only for return values of type
PyObject*.

This should take care of *most* questions about reference count
details, but only for the HTML users.

Still needed:  explanations of exceptions to the normal refcounting
rules in the descriptive text of the appropriate functions, and
support for non-HTML formats.


Index: python.perl
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.65.2.2
retrieving revision 1.65.2.3
diff -C2 -r1.65.2.2 -r1.65.2.3
*** python.perl	1999/10/28 18:44:21	1.65.2.2
--- python.perl	2000/02/01 19:06:40	1.65.2.3
***************
*** 559,562 ****
--- 559,595 ----
  }
  
+ $REFCOUNTS_LOADED = 0;
+ 
+ sub load_refcounts{
+     $REFCOUNTS_LOADED = 1;
+ 
+     use File::Basename;
+     my $myname, $mydir, $myext;
+     ($myname, $mydir, $myext) = fileparse(__FILE__, '\..*');
+     chop $mydir;			# remove trailing '/'
+     ($myname, $mydir, $myext) = fileparse($mydir, '\..*');
+     chop $mydir;			# remove trailing '/'
+     $mydir = getcwd() . "$dd$mydir"
+       unless $mydir =~ s|^/|/|;
+     local $_;
+     my $filename = "$mydir${dd}api${dd}refcounts.dat";
+     open(REFCOUNT_FILE, "<$filename") || die "\n$!\n";
+     print "[loading API refcount data]";
+     while (<REFCOUNT_FILE>) {
+         if (/([a-zA-Z0-9_]+):PyObject\*:([a-zA-Z0-9_]*):(0|[-+]1):(.*)$/) {
+             my($func, $param, $count, $comment) = ($1, $2, $3, $4);
+             #print "\n$func($param) --> $count";
+             $REFCOUNTS{"$func:$param"} = $count;
+         }
+     }
+ }
+ 
+ sub get_refcount{
+     my ($func, $param) = @_;
+     load_refcounts()
+         unless $REFCOUNTS_LOADED;
+     return $REFCOUNTS{"$func:$param"};
+ }
+ 
  sub do_env_cfuncdesc{
      local($_) = @_;
***************
*** 568,572 ****
--- 601,619 ----
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)//;		# ????
+     my $result_rc = get_refcount($function_name, '');
+     my $rcinfo = '';
+     if ($result_rc eq '+1') {
+         $rcinfo = '<span class="label">Return value:</span>'
+                   . "\n  <span class=\"value\">New reference.</span>";
+     }
+     elsif ($result_rc eq '0') {
+         $rcinfo = '<span class="label">Return value:</span>'
+                   . "\n  <span class=\"value\">Borrowed reference.</span>";
+     }
+     if ($rcinfo ne '') {
+         $rcinfo = "\n<div class=\"refcount-info\">\n  $rcinfo\n</div>";
+     }
      return "<dl><dt>$return_type <b>$idx</b> (<var>$arg_list</var>)\n<dd>"
+            . $rcinfo
             . $_
             . '</dl>';



From fdrake@weyr.cnri.reston.va.us  Tue Feb  1 20:12:41 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 1 Feb 2000 15:12:41 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules cryptmodule.c,2.5,2.6
Message-ID: <200002012012.PAA19882@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory weyr:/home/fdrake/projects/python/Modules

Modified Files:
	cryptmodule.c 
Log Message:

Added docstring to crypt.crypt() based on the documentation.


Index: cryptmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/cryptmodule.c,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -r2.5 -r2.6
*** cryptmodule.c	1998/12/04 18:49:42	2.5
--- cryptmodule.c	2000/02/01 20:12:39	2.6
***************
*** 23,28 ****
  }
  
  static PyMethodDef crypt_methods[] = {
! 	{"crypt",	crypt_crypt},
  	{NULL,		NULL}		/* sentinel */
  };
--- 23,37 ----
  }
  
+ static char crypt_crypt__doc__[] = "\
+ crypt(word, salt) -> string\n\
+ word will usually be a user's password. salt is a 2-character string\n\
+ which will be used to select one of 4096 variations of DES. The characters\n\
+ in salt must be either \".\", \"/\", or an alphanumeric character. Returns\n\
+ the hashed password as a string, which will be composed of characters from\n\
+ the same alphabet as the salt.";
+ 
+ 
  static PyMethodDef crypt_methods[] = {
! 	{"crypt",	crypt_crypt, 0, crypt_crypt__doc__},
  	{NULL,		NULL}		/* sentinel */
  };



From guido@cnri.reston.va.us  Tue Feb  1 23:36:58 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 1 Feb 2000 18:36:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib urllib.py,1.89,1.90
Message-ID: <200002012336.SAA20090@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	urllib.py 
Log Message:
Sjoerd Mullender writes:

Fixed a TypeError: not enough arguments; expected 4, got 3.
When authentication is needed, the default http_error_401 method calls 
retry_http_basic_auth.  The default version of that method expected a
data argument which wasn't provided, so now we provide the argument if 
it was given and we also made the data argument optional.

Also changed other calls where data was optional to not pass data if
it was not passed to the calling method (in line with other similar
occurances).


Index: urllib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/urllib.py,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -r1.89 -r1.90
*** urllib.py	1999/12/07 21:37:17	1.89
--- urllib.py	2000/02/01 23:36:55	1.90
***************
*** 500,504 ****
          # In case the server sent a relative URL, join with original:
          newurl = basejoin("http:" + url, newurl)
!         return self.open(newurl, data)
  
      # Error 301 -- also relocated (permanently)
--- 500,507 ----
          # In case the server sent a relative URL, join with original:
          newurl = basejoin("http:" + url, newurl)
!         if data is None:
!             return self.open(newurl)
!         else:
!             return self.open(newurl, data)
  
      # Error 301 -- also relocated (permanently)
***************
*** 518,524 ****
                  if string.lower(scheme) == 'basic':
                     name = 'retry_' + self.type + '_basic_auth'
!                    return getattr(self,name)(url, realm)
  
!     def retry_http_basic_auth(self, url, realm, data):
          host, selector = splithost(url)
          i = string.find(host, '@') + 1
--- 521,530 ----
                  if string.lower(scheme) == 'basic':
                     name = 'retry_' + self.type + '_basic_auth'
!                    if data is None:
!                        return getattr(self,name)(url, realm)
!                    else:
!                        return getattr(self,name)(url, realm, data)
  
!     def retry_http_basic_auth(self, url, realm, data=None):
          host, selector = splithost(url)
          i = string.find(host, '@') + 1
***************
*** 528,534 ****
          host = user + ':' + passwd + '@' + host
          newurl = 'http://' + host + selector
!         return self.open(newurl, data)
     
!     def retry_https_basic_auth(self, url, realm):
              host, selector = splithost(url)
              i = string.find(host, '@') + 1
--- 534,543 ----
          host = user + ':' + passwd + '@' + host
          newurl = 'http://' + host + selector
!         if data is None:
!             return self.open(newurl)
!         else:
!             return self.open(newurl, data)
     
!     def retry_https_basic_auth(self, url, realm, data=None):
              host, selector = splithost(url)
              i = string.find(host, '@') + 1



Return-Path: <guido@kaluha.cnri.reston.va.us>
Delivered-To: python-checkins@dinsdale.python.org
Received: from python.org (parrot.python.org [132.151.1.90])
	by dinsdale.python.org (Postfix) with ESMTP id 891DA1CD42
	for <python-checkins@dinsdale.python.org>; Wed,  2 Feb 2000 10:08:59 -0500 (EST)
Received: from cnri.reston.va.us (ns.CNRI.Reston.VA.US [132.151.1.1] (may be forged))
	by python.org (8.9.1a/8.9.1) with ESMTP id KAA28495
	for <python-checkins@python.org>; Wed, 2 Feb 2000 10:08:57 -0500 (EST)
Received: from kaluha.cnri.reston.va.us (kaluha.cnri.reston.va.us [132.151.7.31])
	by cnri.reston.va.us (8.9.1a/8.9.1) with ESMTP id KAA12031
	for <python-checkins@python.org>; Wed, 2 Feb 2000 10:08:58 -0500 (EST)
Received: from eric.cnri.reston.va.us (eric.cnri.reston.va.us [10.27.10.23])
	by kaluha.cnri.reston.va.us (8.9.1b+Sun/8.9.1) with ESMTP id KAA05279
	for <python-checkins@python.org>; Wed, 2 Feb 2000 10:10:22 -0500 (EST)
Received: (from guido@localhost)
	by eric.cnri.reston.va.us (8.9.3+Sun/8.9.1) id KAA22017
	for python-checkins@python.org; Wed, 2 Feb 2000 10:10:20 -0500 (EST)
Date: Wed, 2 Feb 2000 10:10:20 -0500 (EST)
From: Guido van Rossum <guido@cnri.reston.va.us>
Message-Id: <200002021510.KAA22017@eric.cnri.reston.va.us>
To: python-checkins@python.org
Subject: [Python-checkins] CVS: python/dist/src/Lib fpformat.py,1.5,1.6 copy_reg.py,1.2,1.3 bisect.py,1.3,1.4 audiodev.py,1.7,1.8 UserList.py,1.7,1.8 UserDict.py,1.6,1.7 StringIO.py,1.7,1.8 Queue.py,1.9,1.10 dircmp.py,1.7,1.8 dircache.py,1.4,1.5 cmpcache.py,1.7,1.8 cmp.py,1.7,1.8 cmd.py,1.16,1.17 calendar.py,1.14,1.15 binhex.py,1.10,1.11 bdb.py,1.26,1.27 base64.py,1.8,1.9 aifc.py,1.34,1.35
Sender: python-checkins-admin@python.org
Errors-To: python-checkins-admin@python.org
X-BeenThere: python-checkins@python.org
X-Mailman-Version: 1.2 (experimental)
Precedence: bulk
List-Id: Check-in messages from the Python maintainers <python-checkins.python.org>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	fpformat.py copy_reg.py bisect.py audiodev.py UserList.py 
	UserDict.py StringIO.py Queue.py dircmp.py dircache.py 
	cmpcache.py cmp.py cmd.py calendar.py binhex.py bdb.py 
	base64.py aifc.py 
Log Message:
Mass patch by Ka-Ping Yee:

    1. Comments at the beginning of the module, before
       functions, and before classes have been turned
       into docstrings.

    2. Tabs are normalized to four spaces.

Also, removed the "remove" function from dircmp.py, which reimplements
list.remove() (it must have been very old).



Index: fpformat.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/fpformat.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** fpformat.py	1999/09/10 14:34:48	1.5
--- fpformat.py	2000/02/02 15:10:13	1.6
***************
*** 1,14 ****
! # General floating point formatting functions.
  
! # Functions:
! # fix(x, digits_behind)
! # sci(x, digits_behind)
  
! # Each takes a number or a string and a number of digits as arguments.
  
! # Parameters:
! # x:             number to be formatted; or a string resembling a number
! # digits_behind: number of digits behind the decimal point
! 
  
  import re
--- 1,14 ----
! """General floating point formatting functions.
  
! Functions:
! fix(x, digits_behind)
! sci(x, digits_behind)
  
! Each takes a number or a string and a number of digits as arguments.
  
! Parameters:
! x:             number to be formatted; or a string resembling a number
! digits_behind: number of digits behind the decimal point
! """
  
  import re

Index: copy_reg.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/copy_reg.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** copy_reg.py	1997/05/20 18:03:22	1.2
--- copy_reg.py	2000/02/02 15:10:13	1.3
***************
*** 1,3 ****
! # Helper to provide extensibility for pickle/cPickle.
  
  dispatch_table = {}
--- 1,3 ----
! """Helper to provide extensibility for pickle/cPickle."""
  
  dispatch_table = {}

Index: bisect.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/bisect.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** bisect.py	1998/03/26 20:35:09	1.3
--- bisect.py	2000/02/02 15:10:14	1.4
***************
*** 1,25 ****
! # Bisection algorithms
  
  
- # Insert item x in list a, and keep it sorted assuming a is sorted
- 
  def insort(a, x, lo=0, hi=None):
! 	if hi is None:
! 		hi = len(a)
! 	while lo < hi:
! 		mid = (lo+hi)/2
! 		if x < a[mid]: hi = mid
! 		else: lo = mid+1
! 	a.insert(lo, x)
! 
  
- # Find the index where to insert item x in list a, assuming a is sorted
  
  def bisect(a, x, lo=0, hi=None):
! 	if hi is None:
! 		hi = len(a)
! 	while lo < hi:
! 		mid = (lo+hi)/2
! 		if x < a[mid]: hi = mid
! 		else: lo = mid+1
! 	return lo
--- 1,23 ----
! """Bisection algorithms."""
  
  
  def insort(a, x, lo=0, hi=None):
!     """Insert item x in list a, and keep it sorted assuming a is sorted."""
!     if hi is None:
!         hi = len(a)
!     while lo < hi:
!         mid = (lo+hi)/2
!         if x < a[mid]: hi = mid
!         else: lo = mid+1
!     a.insert(lo, x)
  
  
  def bisect(a, x, lo=0, hi=None):
!     """Find the index where to insert item x in list a, assuming a is sorted."""
!     if hi is None:
!         hi = len(a)
!     while lo < hi:
!         mid = (lo+hi)/2
!         if x < a[mid]: hi = mid
!         else: lo = mid+1
!     return lo

Index: audiodev.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/audiodev.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** audiodev.py	1999/05/03 18:04:07	1.7
--- audiodev.py	2000/02/02 15:10:14	1.8
***************
*** 1,2 ****
--- 1,4 ----
+ """Classes for manipulating audio devices (currently only for Sun and SGI)"""
+ 
  error = 'audiodev.error'
  

Index: UserList.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/UserList.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** UserList.py	1999/03/26 16:20:18	1.7
--- UserList.py	2000/02/02 15:10:14	1.8
***************
*** 1,3 ****
! # A more or less complete user-defined wrapper around list objects
  
  class UserList:
--- 1,3 ----
! """A more or less complete user-defined wrapper around list objects."""
  
  class UserList:

Index: UserDict.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/UserDict.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** UserDict.py	1999/03/26 15:31:12	1.6
--- UserDict.py	2000/02/02 15:10:14	1.7
***************
*** 1,3 ****
! # A more or less complete user-defined wrapper around dictionary objects
  
  class UserDict:
--- 1,3 ----
! """A more or less complete user-defined wrapper around dictionary objects."""
  
  class UserDict:

Index: StringIO.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/StringIO.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** StringIO.py	1998/08/18 17:43:08	1.7
--- StringIO.py	2000/02/02 15:10:14	1.8
***************
*** 1,29 ****
! # class StringIO implements  file-like objects that read/write a
! # string buffer (a.k.a. "memory files").
! #
! # This implements (nearly) all stdio methods.
! #
! # f = StringIO()      # ready for writing
! # f = StringIO(buf)   # ready for reading
! # f.close()           # explicitly release resources held
! # flag = f.isatty()   # always false
! # pos = f.tell()      # get current position
! # f.seek(pos)         # set current position
! # f.seek(pos, mode)   # mode 0: absolute; 1: relative; 2: relative to EOF
! # buf = f.read()      # read until EOF
! # buf = f.read(n)     # read up to n bytes
! # buf = f.readline()  # read until end of line ('\n') or EOF
! # list = f.readlines()# list of f.readline() results until EOF
! # f.write(buf)        # write at current position
! # f.writelines(list)  # for line in list: f.write(line)
! # f.getvalue()        # return whole file's contents as a string
! #
! # Notes:
! # - Using a real file is often faster (but less convenient).
! # - fileno() is left unimplemented so that code which uses it triggers
! #   an exception early.
! # - Seeking far beyond EOF and then writing will insert real null
! #   bytes that occupy space in the buffer.
! # - There's a simple test set (see end of this file).
  
  import string
--- 1,29 ----
! """File-like objects that read from or write to a string buffer.
! 
! This implements (nearly) all stdio methods.
! 
! f = StringIO()      # ready for writing
! f = StringIO(buf)   # ready for reading
! f.close()           # explicitly release resources held
! flag = f.isatty()   # always false
! pos = f.tell()      # get current position
! f.seek(pos)         # set current position
! f.seek(pos, mode)   # mode 0: absolute; 1: relative; 2: relative to EOF
! buf = f.read()      # read until EOF
! buf = f.read(n)     # read up to n bytes
! buf = f.readline()  # read until end of line ('\n') or EOF
! list = f.readlines()# list of f.readline() results until EOF
! f.write(buf)        # write at current position
! f.writelines(list)  # for line in list: f.write(line)
! f.getvalue()        # return whole file's contents as a string
! 
! Notes:
! - Using a real file is often faster (but less convenient).
! - fileno() is left unimplemented so that code which uses it triggers
!   an exception early.
! - Seeking far beyond EOF and then writing will insert real null
!   bytes that occupy space in the buffer.
! - There's a simple test set (see end of this file).
! """
  
  import string

Index: Queue.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/Queue.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Queue.py	1999/09/09 14:54:28	1.9
--- Queue.py	2000/02/02 15:10:14	1.10
***************
*** 1,3 ****
! # A multi-producer, multi-consumer queue.
  
  # define this exception to be compatible with Python 1.5's class
--- 1,3 ----
! """A multi-producer, multi-consumer queue."""
  
  # define this exception to be compatible with Python 1.5's class

Index: dircmp.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/dircmp.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** dircmp.py	1992/12/14 12:57:38	1.7
--- dircmp.py	2000/02/02 15:10:14	1.8
***************
*** 1,5 ****
! # Module 'dirmp'
! #
! # Defines a class to build directory diff tools on.
  
  import os
--- 1,3 ----
! """A class to build directory diff tools on."""
  
  import os
***************
*** 10,203 ****
  from stat import *
  
- # Directory comparison class.
- #
  class dircmp:
! 	#
! 	def new(self, a, b): # Initialize
! 		self.a = a
! 		self.b = b
! 		# Properties that caller may change before calling self.run():
! 		self.hide = [os.curdir, os.pardir] # Names never to be shown
! 		self.ignore = ['RCS', 'tags'] # Names ignored in comparison
! 		#
! 		return self
! 	#
! 	def run(self): # Compare everything except common subdirectories
! 		self.a_list = filter(dircache.listdir(self.a), self.hide)
! 		self.b_list = filter(dircache.listdir(self.b), self.hide)
! 		self.a_list.sort()
! 		self.b_list.sort()
! 		self.phase1()
! 		self.phase2()
! 		self.phase3()
! 	#
! 	def phase1(self): # Compute common names
! 		self.a_only = []
! 		self.common = []
! 		for x in self.a_list:
! 			if x in self.b_list:
! 				self.common.append(x)
! 			else:
! 				self.a_only.append(x)
! 		#
! 		self.b_only = []
! 		for x in self.b_list:
! 			if x not in self.common:
! 				self.b_only.append(x)
! 	#
! 	def phase2(self): # Distinguish files, directories, funnies
! 		self.common_dirs = []
! 		self.common_files = []
! 		self.common_funny = []
! 		#
! 		for x in self.common:
! 			a_path = os.path.join(self.a, x)
! 			b_path = os.path.join(self.b, x)
! 			#
! 			ok = 1
! 			try:
! 				a_stat = statcache.stat(a_path)
! 			except os.error, why:
! 				# print 'Can\'t stat', a_path, ':', why[1]
! 				ok = 0
! 			try:
! 				b_stat = statcache.stat(b_path)
! 			except os.error, why:
! 				# print 'Can\'t stat', b_path, ':', why[1]
! 				ok = 0
! 			#
! 			if ok:
! 				a_type = S_IFMT(a_stat[ST_MODE])
! 				b_type = S_IFMT(b_stat[ST_MODE])
! 				if a_type <> b_type:
! 					self.common_funny.append(x)
! 				elif S_ISDIR(a_type):
! 					self.common_dirs.append(x)
! 				elif S_ISREG(a_type):
! 					self.common_files.append(x)
! 				else:
! 					self.common_funny.append(x)
! 			else:
! 				self.common_funny.append(x)
! 	#
! 	def phase3(self): # Find out differences between common files
! 		xx = cmpfiles(self.a, self.b, self.common_files)
! 		self.same_files, self.diff_files, self.funny_files = xx
! 	#
! 	def phase4(self): # Find out differences between common subdirectories
! 		# A new dircmp object is created for each common subdirectory,
! 		# these are stored in a dictionary indexed by filename.
! 		# The hide and ignore properties are inherited from the parent
! 		self.subdirs = {}
! 		for x in self.common_dirs:
! 			a_x = os.path.join(self.a, x)
! 			b_x = os.path.join(self.b, x)
! 			self.subdirs[x] = newdd = dircmp().new(a_x, b_x)
! 			newdd.hide = self.hide
! 			newdd.ignore = self.ignore
! 			newdd.run()
! 	#
! 	def phase4_closure(self): # Recursively call phase4() on subdirectories
! 		self.phase4()
! 		for x in self.subdirs.keys():
! 			self.subdirs[x].phase4_closure()
! 	#
! 	def report(self): # Print a report on the differences between a and b
! 		# Assume that phases 1 to 3 have been executed
! 		# Output format is purposely lousy
! 		print 'diff', self.a, self.b
! 		if self.a_only:
! 			print 'Only in', self.a, ':', self.a_only
! 		if self.b_only:
! 			print 'Only in', self.b, ':', self.b_only
! 		if self.same_files:
! 			print 'Identical files :', self.same_files
! 		if self.diff_files:
! 			print 'Differing files :', self.diff_files
! 		if self.funny_files:
! 			print 'Trouble with common files :', self.funny_files
! 		if self.common_dirs:
! 			print 'Common subdirectories :', self.common_dirs
! 		if self.common_funny:
! 			print 'Common funny cases :', self.common_funny
! 	#
! 	def report_closure(self): # Print reports on self and on subdirs
! 		# If phase 4 hasn't been done, no subdir reports are printed
! 		self.report()
! 		try:
! 			x = self.subdirs
! 		except AttributeError:
! 			return # No subdirectories computed
! 		for x in self.subdirs.keys():
! 			print
! 			self.subdirs[x].report_closure()
! 	#
! 	def report_phase4_closure(self): # Report and do phase 4 recursively
! 		self.report()
! 		self.phase4()
! 		for x in self.subdirs.keys():
! 			print
! 			self.subdirs[x].report_phase4_closure()
! 
! 
! # Compare common files in two directories.
! # Return:
! #	- files that compare equal
! #	- files that compare different
! #	- funny cases (can't stat etc.)
! #
  def cmpfiles(a, b, common):
! 	res = ([], [], [])
! 	for x in common:
! 		res[cmp(os.path.join(a, x), os.path.join(b, x))].append(x)
! 	return res
  
  
- # Compare two files.
- # Return:
- #	0 for equal
- #	1 for different
- #	2 for funny cases (can't stat, etc.)
- #
  def cmp(a, b):
! 	try:
! 		if cmpcache.cmp(a, b): return 0
! 		return 1
! 	except os.error:
! 		return 2
! 
! 
! # Remove a list item.
! # NB: This modifies the list argument.
! #
! def remove(list, item):
! 	for i in range(len(list)):
! 		if list[i] == item:
! 			del list[i]
! 			break
  
  
- # Return a copy with items that occur in skip removed.
- #
  def filter(list, skip):
! 	result = []
! 	for item in list:
! 		if item not in skip: result.append(item)
! 	return result
  
  
! # Demonstration and testing.
! #
  def demo():
! 	import sys
! 	import getopt
! 	options, args = getopt.getopt(sys.argv[1:], 'r')
! 	if len(args) <> 2: raise getopt.error, 'need exactly two args'
! 	dd = dircmp().new(args[0], args[1])
! 	dd.run()
! 	if ('-r', '') in options:
! 		dd.report_phase4_closure()
! 	else:
! 		dd.report()
  
! # demo()
--- 8,201 ----
  from stat import *
  
  class dircmp:
!     """Directory comparison class."""
! 
!     def new(self, a, b):
!         """Initialize."""
!         self.a = a
!         self.b = b
!         # Properties that caller may change before calling self.run():
!         self.hide = [os.curdir, os.pardir] # Names never to be shown
!         self.ignore = ['RCS', 'tags'] # Names ignored in comparison
! 
!         return self
! 
!     def run(self):
!         """Compare everything except common subdirectories."""
!         self.a_list = filter(dircache.listdir(self.a), self.hide)
!         self.b_list = filter(dircache.listdir(self.b), self.hide)
!         self.a_list.sort()
!         self.b_list.sort()
!         self.phase1()
!         self.phase2()
!         self.phase3()
! 
!     def phase1(self):
!         """Compute common names."""
!         self.a_only = []
!         self.common = []
!         for x in self.a_list:
!             if x in self.b_list:
!                 self.common.append(x)
!             else:
!                 self.a_only.append(x)
! 
!         self.b_only = []
!         for x in self.b_list:
!             if x not in self.common:
!                 self.b_only.append(x)
! 
!     def phase2(self):
!         """Distinguish files, directories, funnies."""
!         self.common_dirs = []
!         self.common_files = []
!         self.common_funny = []
! 
!         for x in self.common:
!             a_path = os.path.join(self.a, x)
!             b_path = os.path.join(self.b, x)
! 
!             ok = 1
!             try:
!                 a_stat = statcache.stat(a_path)
!             except os.error, why:
!                 # print 'Can\'t stat', a_path, ':', why[1]
!                 ok = 0
!             try:
!                 b_stat = statcache.stat(b_path)
!             except os.error, why:
!                 # print 'Can\'t stat', b_path, ':', why[1]
!                 ok = 0
! 
!             if ok:
!                 a_type = S_IFMT(a_stat[ST_MODE])
!                 b_type = S_IFMT(b_stat[ST_MODE])
!                 if a_type <> b_type:
!                     self.common_funny.append(x)
!                 elif S_ISDIR(a_type):
!                     self.common_dirs.append(x)
!                 elif S_ISREG(a_type):
!                     self.common_files.append(x)
!                 else:
!                     self.common_funny.append(x)
!             else:
!                 self.common_funny.append(x)
! 
!     def phase3(self):
!         """Find out differences between common files."""
!         xx = cmpfiles(self.a, self.b, self.common_files)
!         self.same_files, self.diff_files, self.funny_files = xx
! 
!     def phase4(self):
!         """Find out differences between common subdirectories.
!         A new dircmp object is created for each common subdirectory,
!         these are stored in a dictionary indexed by filename.
!         The hide and ignore properties are inherited from the parent."""
!         self.subdirs = {}
!         for x in self.common_dirs:
!             a_x = os.path.join(self.a, x)
!             b_x = os.path.join(self.b, x)
!             self.subdirs[x] = newdd = dircmp().new(a_x, b_x)
!             newdd.hide = self.hide
!             newdd.ignore = self.ignore
!             newdd.run()
! 
!     def phase4_closure(self):
!         """Recursively call phase4() on subdirectories."""
!         self.phase4()
!         for x in self.subdirs.keys():
!             self.subdirs[x].phase4_closure()
! 
!     def report(self):
!         """Print a report on the differences between a and b."""
!         # Assume that phases 1 to 3 have been executed
!         # Output format is purposely lousy
!         print 'diff', self.a, self.b
!         if self.a_only:
!             print 'Only in', self.a, ':', self.a_only
!         if self.b_only:
!             print 'Only in', self.b, ':', self.b_only
!         if self.same_files:
!             print 'Identical files :', self.same_files
!         if self.diff_files:
!             print 'Differing files :', self.diff_files
!         if self.funny_files:
!             print 'Trouble with common files :', self.funny_files
!         if self.common_dirs:
!             print 'Common subdirectories :', self.common_dirs
!         if self.common_funny:
!             print 'Common funny cases :', self.common_funny
! 
!     def report_closure(self):
!         """Print reports on self and on subdirs.
!         If phase 4 hasn't been done, no subdir reports are printed."""
!         self.report()
!         try:
!             x = self.subdirs
!         except AttributeError:
!             return # No subdirectories computed
!         for x in self.subdirs.keys():
!             print
!             self.subdirs[x].report_closure()
! 
!     def report_phase4_closure(self):
!         """Report and do phase 4 recursively."""
!         self.report()
!         self.phase4()
!         for x in self.subdirs.keys():
!             print
!             self.subdirs[x].report_phase4_closure()
! 
! 
  def cmpfiles(a, b, common):
!     """Compare common files in two directories.
!     Return:
!         - files that compare equal
!         - files that compare different
!         - funny cases (can't stat etc.)"""
! 
!     res = ([], [], [])
!     for x in common:
!         res[cmp(os.path.join(a, x), os.path.join(b, x))].append(x)
!     return res
  
  
  def cmp(a, b):
!     """Compare two files.
!     Return:
!         0 for equal
!         1 for different
!         2 for funny cases (can't stat, etc.)"""
! 
!     try:
!         if cmpcache.cmp(a, b): return 0
!         return 1
!     except os.error:
!         return 2
  
  
  def filter(list, skip):
!     """Return a copy with items that occur in skip removed."""
  
+     result = []
+     for item in list:
+         if item not in skip: result.append(item)
+     return result
  
! 
  def demo():
!     """Demonstration and testing."""
! 
!     import sys
!     import getopt
!     options, args = getopt.getopt(sys.argv[1:], 'r')
!     if len(args) <> 2: raise getopt.error, 'need exactly two args'
!     dd = dircmp().new(args[0], args[1])
!     dd.run()
!     if ('-r', '') in options:
!         dd.report_phase4_closure()
!     else:
!         dd.report()
  
! if __name__ == "__main__":
!     demo()

Index: dircache.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/dircache.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dircache.py	1992/03/31 18:55:14	1.4
--- dircache.py	2000/02/02 15:10:14	1.5
***************
*** 1,7 ****
! # Module 'dircache'
! #
! # Return a sorted list of the files in a directory, using a cache
! # to avoid reading the directory more often than necessary.
! # Also contains a subroutine to append slashes to directories.
  
  import os
--- 1,5 ----
! """Return a sorted list of the files in a directory, using a cache
! to avoid reading the directory more often than necessary.
! Also contains a subroutine to append slashes to directories."""
  
  import os
***************
*** 9,35 ****
  cache = {}
  
! def listdir(path): # List directory contents, using cache
! 	try:
! 		cached_mtime, list = cache[path]
! 		del cache[path]
! 	except KeyError:
! 		cached_mtime, list = -1, []
! 	try:
! 		mtime = os.stat(path)[8]
! 	except os.error:
! 		return []
! 	if mtime <> cached_mtime:
! 		try:
! 			list = os.listdir(path)
! 		except os.error:
! 			return []
! 		list.sort()
! 	cache[path] = mtime, list
! 	return list
  
  opendir = listdir # XXX backward compatibility
  
! def annotate(head, list): # Add '/' suffixes to directories
! 	for i in range(len(list)):
! 		if os.path.isdir(os.path.join(head, list[i])):
! 			list[i] = list[i] + '/'
--- 7,35 ----
  cache = {}
  
! def listdir(path):
!     """List directory contents, using cache."""
!     try:
!         cached_mtime, list = cache[path]
!         del cache[path]
!     except KeyError:
!         cached_mtime, list = -1, []
!     try:
!         mtime = os.stat(path)[8]
!     except os.error:
!         return []
!     if mtime <> cached_mtime:
!         try:
!             list = os.listdir(path)
!         except os.error:
!             return []
!         list.sort()
!     cache[path] = mtime, list
!     return list
  
  opendir = listdir # XXX backward compatibility
  
! def annotate(head, list):
!     """Add '/' suffixes to directories."""
!     for i in range(len(list)):
!         if os.path.isdir(os.path.join(head, list[i])):
!             list[i] = list[i] + '/'

Index: cmpcache.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/cmpcache.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** cmpcache.py	1999/06/25 14:21:44	1.7
--- cmpcache.py	2000/02/02 15:10:14	1.8
***************
*** 1,12 ****
! # Module 'cmpcache'
! #
! # Efficiently compare files, boolean outcome only (equal / not equal).
! #
! # Tricks (used in this order):
! #	- Use the statcache module to avoid statting files more than once
! #	- Files with identical type, size & mtime are assumed to be clones
! #	- Files with different type or size cannot be identical
! #	- We keep a cache of outcomes of earlier comparisons
! #	- We don't fork a process to run 'cmp' but read the files ourselves
  
  import os
--- 1,11 ----
! """Efficiently compare files, boolean outcome only (equal / not equal).
! 
! Tricks (used in this order):
!     - Use the statcache module to avoid statting files more than once
!     - Files with identical type, size & mtime are assumed to be clones
!     - Files with different type or size cannot be identical
!     - We keep a cache of outcomes of earlier comparisons
!     - We don't fork a process to run 'cmp' but read the files ourselves
! """
  
  import os
***************
*** 20,68 ****
  
  
- # Compare two files, use the cache if possible.
- # May raise os.error if a stat or open of either fails.
- #
  def cmp(f1, f2, shallow=1):
! 	# Return 1 for identical files, 0 for different.
! 	# Raise exceptions if either file could not be statted, read, etc.
! 	s1, s2 = sig(statcache.stat(f1)), sig(statcache.stat(f2))
! 	if not S_ISREG(s1[0]) or not S_ISREG(s2[0]):
! 		# Either is a not a plain file -- always report as different
! 		return 0
! 	if shallow and s1 == s2:
! 		# type, size & mtime match -- report same
! 		return 1
! 	if s1[:2] <> s2[:2]: # Types or sizes differ, don't bother
! 		# types or sizes differ -- report different
! 		return 0
! 	# same type and size -- look in the cache
! 	key = f1 + ' ' + f2
! 	if cache.has_key(key):
! 		cs1, cs2, outcome = cache[key]
! 		# cache hit
! 		if s1 == cs1 and s2 == cs2:
! 			# cached signatures match
! 			return outcome
! 		# stale cached signature(s)
! 	# really compare
! 	outcome = do_cmp(f1, f2)
! 	cache[key] = s1, s2, outcome
! 	return outcome
  
- # Return signature (i.e., type, size, mtime) from raw stat data.
- #
  def sig(st):
! 	return S_IFMT(st[ST_MODE]), st[ST_SIZE], st[ST_MTIME]
  
- # Compare two files, really.
- #
  def do_cmp(f1, f2):
! 	#print '    cmp', f1, f2 # XXX remove when debugged
! 	bufsize = 8*1024 # Could be tuned
! 	fp1 = open(f1, 'rb')
! 	fp2 = open(f2, 'rb')
! 	while 1:
! 		b1 = fp1.read(bufsize)
! 		b2 = fp2.read(bufsize)
! 		if b1 <> b2: return 0
! 		if not b1: return 1
--- 19,64 ----
  
  
  def cmp(f1, f2, shallow=1):
!     """Compare two files, use the cache if possible.
!     May raise os.error if a stat or open of either fails.
!     Return 1 for identical files, 0 for different.
!     Raise exceptions if either file could not be statted, read, etc."""
!     s1, s2 = sig(statcache.stat(f1)), sig(statcache.stat(f2))
!     if not S_ISREG(s1[0]) or not S_ISREG(s2[0]):
!         # Either is a not a plain file -- always report as different
!         return 0
!     if shallow and s1 == s2:
!         # type, size & mtime match -- report same
!         return 1
!     if s1[:2] <> s2[:2]: # Types or sizes differ, don't bother
!         # types or sizes differ -- report different
!         return 0
!     # same type and size -- look in the cache
!     key = f1 + ' ' + f2
!     if cache.has_key(key):
!         cs1, cs2, outcome = cache[key]
!         # cache hit
!         if s1 == cs1 and s2 == cs2:
!             # cached signatures match
!             return outcome
!         # stale cached signature(s)
!     # really compare
!     outcome = do_cmp(f1, f2)
!     cache[key] = s1, s2, outcome
!     return outcome
  
  def sig(st):
!     """Return signature (i.e., type, size, mtime) from raw stat data."""
!     return S_IFMT(st[ST_MODE]), st[ST_SIZE], st[ST_MTIME]
  
  def do_cmp(f1, f2):
!     """Compare two files, really."""
!     #print '    cmp', f1, f2 # XXX remove when debugged
!     bufsize = 8*1024 # Could be tuned
!     fp1 = open(f1, 'rb')
!     fp2 = open(f2, 'rb')
!     while 1:
!         b1 = fp1.read(bufsize)
!         b2 = fp2.read(bufsize)
!         if b1 <> b2: return 0
!         if not b1: return 1

Index: cmp.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/cmp.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** cmp.py	1999/06/25 14:12:50	1.7
--- cmp.py	2000/02/02 15:10:14	1.8
***************
*** 1,61 ****
! # Module 'cmp'
  
! # Efficiently compare files, boolean outcome only (equal / not equal).
  
- # Tricks (used in this order):
- #	- Files with identical type, size & mtime are assumed to be clones
- #	- Files with different type or size cannot be identical
- #	- We keep a cache of outcomes of earlier comparisons
- #	- We don't fork a process to run 'cmp' but read the files ourselves
- 
  import os
  
  cache = {}
  
! def cmp(f1, f2, shallow=1): # Compare two files, use the cache if possible.
! 	# Return 1 for identical files, 0 for different.
! 	# Raise exceptions if either file could not be statted, read, etc.
! 	s1, s2 = sig(os.stat(f1)), sig(os.stat(f2))
! 	if s1[0] <> 8 or s2[0] <> 8:
! 		# Either is a not a plain file -- always report as different
! 		return 0
! 	if shallow and s1 == s2:
! 		# type, size & mtime match -- report same
! 		return 1
! 	if s1[:2] <> s2[:2]: # Types or sizes differ, don't bother
! 		# types or sizes differ -- report different
! 		return 0
! 	# same type and size -- look in the cache
! 	key = (f1, f2)
! 	try:
! 		cs1, cs2, outcome = cache[key]
! 		# cache hit
! 		if s1 == cs1 and s2 == cs2:
! 			# cached signatures match
! 			return outcome
! 		# stale cached signature(s)
! 	except KeyError:
! 		# cache miss
! 		pass
! 	# really compare
! 	outcome = do_cmp(f1, f2)
! 	cache[key] = s1, s2, outcome
! 	return outcome
! 
! def sig(st): # Return signature (i.e., type, size, mtime) from raw stat data
! 	# 0-5: st_mode, st_ino, st_dev, st_nlink, st_uid, st_gid
! 	# 6-9: st_size, st_atime, st_mtime, st_ctime
! 	type = st[0] / 4096
! 	size = st[6]
! 	mtime = st[8]
! 	return type, size, mtime
! 
! def do_cmp(f1, f2): # Compare two files, really
! 	bufsize = 8*1024 # Could be tuned
! 	fp1 = open(f1, 'rb')
! 	fp2 = open(f2, 'rb')
! 	while 1:
! 		b1 = fp1.read(bufsize)
! 		b2 = fp2.read(bufsize)
! 		if b1 <> b2: return 0
! 		if not b1: return 1
--- 1,63 ----
! """Efficiently compare files, boolean outcome only (equal / not equal).
  
! Tricks (used in this order):
!     - Files with identical type, size & mtime are assumed to be clones
!     - Files with different type or size cannot be identical
!     - We keep a cache of outcomes of earlier comparisons
!     - We don't fork a process to run 'cmp' but read the files ourselves
! """
  
  import os
  
  cache = {}
  
! def cmp(f1, f2, shallow=1):
!     """Compare two files, use the cache if possible.
!     Return 1 for identical files, 0 for different.
!     Raise exceptions if either file could not be statted, read, etc."""
!     s1, s2 = sig(os.stat(f1)), sig(os.stat(f2))
!     if s1[0] <> 8 or s2[0] <> 8:
!         # Either is a not a plain file -- always report as different
!         return 0
!     if shallow and s1 == s2:
!         # type, size & mtime match -- report same
!         return 1
!     if s1[:2] <> s2[:2]: # Types or sizes differ, don't bother
!         # types or sizes differ -- report different
!         return 0
!     # same type and size -- look in the cache
!     key = (f1, f2)
!     try:
!         cs1, cs2, outcome = cache[key]
!         # cache hit
!         if s1 == cs1 and s2 == cs2:
!             # cached signatures match
!             return outcome
!         # stale cached signature(s)
!     except KeyError:
!         # cache miss
!         pass
!     # really compare
!     outcome = do_cmp(f1, f2)
!     cache[key] = s1, s2, outcome
!     return outcome
! 
! def sig(st):
!     """Return signature (i.e., type, size, mtime) from raw stat data
!     0-5: st_mode, st_ino, st_dev, st_nlink, st_uid, st_gid
!     6-9: st_size, st_atime, st_mtime, st_ctime"""
!     type = st[0] / 4096
!     size = st[6]
!     mtime = st[8]
!     return type, size, mtime
! 
! def do_cmp(f1, f2):
!     """Compare two files, really."""
!     bufsize = 8*1024 # Could be tuned
!     fp1 = open(f1, 'rb')
!     fp2 = open(f2, 'rb')
!     while 1:
!         b1 = fp1.read(bufsize)
!         b2 = fp2.read(bufsize)
!         if b1 <> b2: return 0
!         if not b1: return 1

Index: cmd.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/cmd.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** cmd.py	1999/05/03 18:08:16	1.16
--- cmd.py	2000/02/02 15:10:14	1.17
***************
*** 1,39 ****
! # A generic class to build line-oriented command interpreters
! #
! # Interpreters constructed with this class obey the following conventions:
! #
! # 1. End of file on input is processed as the command 'EOF'.
! # 2. A command is parsed out of each line by collecting the prefix composed
! #    of characters in the identchars member.
! # 3. A command `foo' is dispatched to a method 'do_foo()'; the do_ method
! #    is passed a single argument consisting of the remainder of the line.
! # 4. Typing an empty line repeats the last command.  (Actually, it calls the
! #    method `emptyline', which may be overridden in a subclass.)
! # 5. There is a predefined `help' method.  Given an argument `topic', it
! #    calls the command `help_topic'.  With no arguments, it lists all topics
! #    with defined help_ functions, broken into up to three topics; documented
! #    commands, miscellaneous help topics, and undocumented commands.
! # 6. The command '?' is a synonym for `help'.  The command '!' is a synonym
! #    for `shell', if a do_shell method exists.
! #
! # The `default' method may be overridden to intercept commands for which there
! # is no do_ method.
! #
! # The data member `self.ruler' sets the character used to draw separator lines
! # in the help messages.  If empty, no ruler line is drawn.  It defaults to "=".
! #
! # If the value of `self.intro' is nonempty when the cmdloop method is called,
! # it is printed out on interpreter startup.  This value may be overridden
! # via an optional argument to the cmdloop() method.
! #
! # The data members `self.doc_header', `self.misc_header', and
! # `self.undoc_header' set the headers used for the help function's
! # listings of documented functions, miscellaneous topics, and undocumented
! # functions respectively.
! #
! # These interpreters use raw_input; thus, if the readline module is loaded,
! # they automatically support Emacs-like command history and editing features.
! #
  
  import string
  
--- 1,39 ----
! """A generic class to build line-oriented command interpreters.
  
+ Interpreters constructed with this class obey the following conventions:
+ 
+ 1. End of file on input is processed as the command 'EOF'.
+ 2. A command is parsed out of each line by collecting the prefix composed
+    of characters in the identchars member.
+ 3. A command `foo' is dispatched to a method 'do_foo()'; the do_ method
+    is passed a single argument consisting of the remainder of the line.
+ 4. Typing an empty line repeats the last command.  (Actually, it calls the
+    method `emptyline', which may be overridden in a subclass.)
+ 5. There is a predefined `help' method.  Given an argument `topic', it
+    calls the command `help_topic'.  With no arguments, it lists all topics
+    with defined help_ functions, broken into up to three topics; documented
+    commands, miscellaneous help topics, and undocumented commands.
+ 6. The command '?' is a synonym for `help'.  The command '!' is a synonym
+    for `shell', if a do_shell method exists.
+ 
+ The `default' method may be overridden to intercept commands for which there
+ is no do_ method.
+ 
+ The data member `self.ruler' sets the character used to draw separator lines
+ in the help messages.  If empty, no ruler line is drawn.  It defaults to "=".
+ 
+ If the value of `self.intro' is nonempty when the cmdloop method is called,
+ it is printed out on interpreter startup.  This value may be overridden
+ via an optional argument to the cmdloop() method.
+ 
+ The data members `self.doc_header', `self.misc_header', and
+ `self.undoc_header' set the headers used for the help function's
+ listings of documented functions, miscellaneous topics, and undocumented
+ functions respectively.
+ 
+ These interpreters use raw_input; thus, if the readline module is loaded,
+ they automatically support Emacs-like command history and editing features.
+ """
+ 
  import string
  
***************
*** 42,187 ****
  
  class Cmd:
! 	prompt = PROMPT
! 	identchars = IDENTCHARS
! 	ruler = '='
! 	lastcmd = ''
! 	cmdqueue = []
! 	intro = None
! 	doc_leader = ""
! 	doc_header = "Documented commands (type help <topic>):"
! 	misc_header = "Miscellaneous help topics:"
! 	undoc_header = "Undocumented commands:"
! 	nohelp = "*** No help on %s"
! 
! 	def __init__(self): pass
! 
! 	def cmdloop(self, intro=None):
! 		self.preloop()
! 		if intro != None:
! 			self.intro = intro
! 		if self.intro:
! 			print self.intro
! 		stop = None
! 		while not stop:
! 			if self.cmdqueue:
! 				line = self.cmdqueue[0]
! 				del self.cmdqueue[0]
! 			else:
! 				try:
! 					line = raw_input(self.prompt)
! 				except EOFError:
! 					line = 'EOF'
! 			line = self.precmd(line)
! 			stop = self.onecmd(line)
! 			stop = self.postcmd(stop, line)
! 		self.postloop()
! 
! 	def precmd(self, line):
! 		return line
! 
! 	def postcmd(self, stop, line):
! 		return stop
! 
! 	def preloop(self):
! 		pass
! 
! 	def postloop(self):
! 		pass
! 
! 	def onecmd(self, line):
! 		line = string.strip(line)
! 		if line == '?':
! 			line = 'help'
! 		elif line == '!':
! 			if hasattr(self, 'do_shell'):
! 				line = 'shell'
! 			else:
! 				return self.default(line)
! 		elif not line:
! 			return self.emptyline()
! 		self.lastcmd = line
! 		i, n = 0, len(line)
! 		while i < n and line[i] in self.identchars: i = i+1
! 		cmd, arg = line[:i], string.strip(line[i:])
! 		if cmd == '':
! 			return self.default(line)
! 		else:
! 			try:
! 				func = getattr(self, 'do_' + cmd)
! 			except AttributeError:
! 				return self.default(line)
! 			return func(arg)
! 
! 	def emptyline(self):
! 		if self.lastcmd:
! 			return self.onecmd(self.lastcmd)
! 
! 	def default(self, line):
! 		print '*** Unknown syntax:', line
! 
! 	def do_help(self, arg):
! 		if arg:
! 			# XXX check arg syntax
! 			try:
! 				func = getattr(self, 'help_' + arg)
! 			except:
! 				try:
! 					doc=getattr(self, 'do_' + arg).__doc__
! 					if doc:
! 						print doc
! 						return
! 				except:
! 					pass
! 				print self.nohelp % (arg,)
! 				return
! 			func()
! 		else:
! 			# Inheritance says we have to look in class and
! 			# base classes; order is not important.
! 			names = []
! 			classes = [self.__class__]
! 			while classes:
! 				aclass = classes[0]
! 				if aclass.__bases__:
! 				    classes = classes + list(aclass.__bases__)
! 				names = names + dir(aclass)
! 				del classes[0]
! 			cmds_doc = []
! 			cmds_undoc = []
! 			help = {}
! 			for name in names:
! 				if name[:5] == 'help_':
! 					help[name[5:]]=1
! 			names.sort()
! 			# There can be duplicates if routines overridden
! 			prevname = ''
! 			for name in names:
! 				if name[:3] == 'do_':
! 					if name == prevname:
! 						continue
! 					prevname = name
! 					cmd=name[3:]
! 					if help.has_key(cmd):
! 						cmds_doc.append(cmd)
! 						del help[cmd]
! 					elif getattr(self, name).__doc__:
! 						cmds_doc.append(cmd)
! 					else:
! 						cmds_undoc.append(cmd)
! 			print self.doc_leader
! 			self.print_topics(self.doc_header,   cmds_doc,   15,80)
! 			self.print_topics(self.misc_header,  help.keys(),15,80)
! 			self.print_topics(self.undoc_header, cmds_undoc, 15,80)
! 
! 	def print_topics(self, header, cmds, cmdlen, maxcol):
! 		if cmds:
! 			print header;
! 			if self.ruler:
! 			    print self.ruler * len(header)
! 			(cmds_per_line,junk)=divmod(maxcol,cmdlen)
! 			col=cmds_per_line
! 			for cmd in cmds:
! 				if col==0: print
! 				print (("%-"+`cmdlen`+"s") % cmd),
! 				col = (col+1) % cmds_per_line
! 			print "\n"
--- 42,187 ----
  
  class Cmd:
!     prompt = PROMPT
!     identchars = IDENTCHARS
!     ruler = '='
!     lastcmd = ''
!     cmdqueue = []
!     intro = None
!     doc_leader = ""
!     doc_header = "Documented commands (type help <topic>):"
!     misc_header = "Miscellaneous help topics:"
!     undoc_header = "Undocumented commands:"
!     nohelp = "*** No help on %s"
! 
!     def __init__(self): pass
! 
!     def cmdloop(self, intro=None):
!         self.preloop()
!         if intro != None:
!             self.intro = intro
!         if self.intro:
!             print self.intro
!         stop = None
!         while not stop:
!             if self.cmdqueue:
!                 line = self.cmdqueue[0]
!                 del self.cmdqueue[0]
!             else:
!                 try:
!                     line = raw_input(self.prompt)
!                 except EOFError:
!                     line = 'EOF'
!             line = self.precmd(line)
!             stop = self.onecmd(line)
!             stop = self.postcmd(stop, line)
!         self.postloop()
! 
!     def precmd(self, line):
!         return line
! 
!     def postcmd(self, stop, line):
!         return stop
! 
!     def preloop(self):
!         pass
! 
!     def postloop(self):
!         pass
! 
!     def onecmd(self, line):
!         line = string.strip(line)
!         if line == '?':
!             line = 'help'
!         elif line == '!':
!             if hasattr(self, 'do_shell'):
!                 line = 'shell'
!             else:
!                 return self.default(line)
!         elif not line:
!             return self.emptyline()
!         self.lastcmd = line
!         i, n = 0, len(line)
!         while i < n and line[i] in self.identchars: i = i+1
!         cmd, arg = line[:i], string.strip(line[i:])
!         if cmd == '':
!             return self.default(line)
!         else:
!             try:
!                 func = getattr(self, 'do_' + cmd)
!             except AttributeError:
!                 return self.default(line)
!             return func(arg)
! 
!     def emptyline(self):
!         if self.lastcmd:
!             return self.onecmd(self.lastcmd)
! 
!     def default(self, line):
!         print '*** Unknown syntax:', line
! 
!     def do_help(self, arg):
!         if arg:
!             # XXX check arg syntax
!             try:
!                 func = getattr(self, 'help_' + arg)
!             except:
!                 try:
!                     doc=getattr(self, 'do_' + arg).__doc__
!                     if doc:
!                         print doc
!                         return
!                 except:
!                     pass
!                 print self.nohelp % (arg,)
!                 return
!             func()
!         else:
!             # Inheritance says we have to look in class and
!             # base classes; order is not important.
!             names = []
!             classes = [self.__class__]
!             while classes:
!                 aclass = classes[0]
!                 if aclass.__bases__:
!                     classes = classes + list(aclass.__bases__)
!                 names = names + dir(aclass)
!                 del classes[0]
!             cmds_doc = []
!             cmds_undoc = []
!             help = {}
!             for name in names:
!                 if name[:5] == 'help_':
!                     help[name[5:]]=1
!             names.sort()
!             # There can be duplicates if routines overridden
!             prevname = ''
!             for name in names:
!                 if name[:3] == 'do_':
!                     if name == prevname:
!                         continue
!                     prevname = name
!                     cmd=name[3:]
!                     if help.has_key(cmd):
!                         cmds_doc.append(cmd)
!                         del help[cmd]
!                     elif getattr(self, name).__doc__:
!                         cmds_doc.append(cmd)
!                     else:
!                         cmds_undoc.append(cmd)
!             print self.doc_leader
!             self.print_topics(self.doc_header,   cmds_doc,   15,80)
!             self.print_topics(self.misc_header,  help.keys(),15,80)
!             self.print_topics(self.undoc_header, cmds_undoc, 15,80)
! 
!     def print_topics(self, header, cmds, cmdlen, maxcol):
!         if cmds:
!             print header;
!             if self.ruler:
!                 print self.ruler * len(header)
!             (cmds_per_line,junk)=divmod(maxcol,cmdlen)
!             col=cmds_per_line
!             for cmd in cmds:
!                 if col==0: print
!                 print (("%-"+`cmdlen`+"s") % cmd),
!                 col = (col+1) % cmds_per_line
!             print "\n"

Index: calendar.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/calendar.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** calendar.py	1999/06/09 15:07:38	1.14
--- calendar.py	2000/02/02 15:10:14	1.15
***************
*** 1,5 ****
! ###############################
! # Calendar printing functions #
! ###############################
  
  # Revision 2: uses funtions from built-in time module
--- 1,3 ----
! """Calendar printing functions"""
  
  # Revision 2: uses funtions from built-in time module
***************
*** 23,170 ****
  
  # Full and abbreviated names of weekdays
! day_name = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', \
! 	    'Friday', 'Saturday', 'Sunday']
  day_abbr = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
  
  # Full and abbreviated names of months (1-based arrays!!!)
! month_name =          ['', 'January',   'February', 'March',    'April', \
! 		           'May',       'June',     'July',     'August', \
! 			   'September', 'October',  'November', 'December']
! month_abbr =       ['   ', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', \
! 		           'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
  
- # Return 1 for leap years, 0 for non-leap years
  def isleap(year):
! 	return year % 4 == 0 and (year % 100 <> 0 or year % 400 == 0)
  
- # Return number of leap years in range [y1, y2)
- # Assume y1 <= y2 and no funny (non-leap century) years
  def leapdays(y1, y2):
! 	return (y2+3)/4 - (y1+3)/4
  
- # Return weekday (0-6 ~ Mon-Sun) for year (1970-...), month (1-12), day (1-31)
  def weekday(year, month, day):
! 	secs = mktime((year, month, day, 0, 0, 0, 0, 0, 0))
! 	tuple = localtime(secs)
! 	return tuple[6]
  
- # Return weekday (0-6 ~ Mon-Sun) and number of days (28-31) for year, month
  def monthrange(year, month):
! 	if not 1 <= month <= 12: raise ValueError, 'bad month number'
! 	day1 = weekday(year, month, 1)
! 	ndays = mdays[month] + (month == February and isleap(year))
! 	return day1, ndays
  
- # Return a matrix representing a month's calendar
- # Each row represents a week; days outside this month are zero
  def _monthcalendar(year, month):
! 	day1, ndays = monthrange(year, month)
! 	rows = []
! 	r7 = range(7)
! 	day = 1 - day1
! 	while day <= ndays:
! 		row = [0, 0, 0, 0, 0, 0, 0]
! 		for i in r7:
! 			if 1 <= day <= ndays: row[i] = day
! 			day = day + 1
! 		rows.append(row)
! 	return rows
  
- # Caching interface to _monthcalendar
  _mc_cache = {}
  def monthcalendar(year, month):
! 	key = (year, month)
! 	if _mc_cache.has_key(key):
! 		return _mc_cache[key]
! 	else:
! 		_mc_cache[key] = ret = _monthcalendar(year, month)
! 		return ret
  
- # Center a string in a field
  def _center(str, width):
! 	n = width - len(str)
! 	if n <= 0: return str
! 	return ' '*((n+1)/2) + str + ' '*((n)/2)
  
  # XXX The following code knows that print separates items with space!
  
- # Print a single week (no newline)
  def prweek(week, width):
! 	for day in week:
! 		if day == 0: s = ''
! 		else: s = `day`
! 		print _center(s, width),
  
- # Return a header for a week
  def weekheader(width):
! 	str = ''
! 	if width >= 9: names = day_name
! 	else: names = day_abbr
! 	for i in range(7):
! 		if str: str = str + ' '
! 		str = str + _center(names[i%7][:width], width)
! 	return str
  
- # Print a month's calendar
  def prmonth(year, month, w = 0, l = 0):
! 	w = max(2, w)
! 	l = max(1, l)
! 	print _center(month_name[month] + ' ' + `year`, 7*(w+1) - 1),
! 	print '\n'*l,
! 	print weekheader(w),
! 	print '\n'*l,
! 	for week in monthcalendar(year, month):
! 		prweek(week, w)
! 		print '\n'*l,
  
  # Spacing of month columns
! _colwidth = 7*3 - 1			# Amount printed by prweek()
! _spacing = ' '*4			# Spaces between columns
  
- # 3-column formatting for year calendars
  def format3c(a, b, c):
! 	print _center(a, _colwidth),
! 	print _spacing,
! 	print _center(b, _colwidth),
! 	print _spacing,
! 	print _center(c, _colwidth)
  
- # Print a year's calendar
  def prcal(year):
! 	header = weekheader(2)
! 	format3c('', `year`, '')
! 	for q in range(January, January+12, 3):
! 		print
! 		format3c(month_name[q], month_name[q+1], month_name[q+2])
! 		format3c(header, header, header)
! 		data = []
! 		height = 0
! 		for month in range(q, q+3):
! 			cal = monthcalendar(year, month)
! 			if len(cal) > height: height = len(cal)
! 			data.append(cal)
! 		for i in range(height):
! 			for cal in data:
! 				if i >= len(cal):
! 					print ' '*_colwidth,
! 				else:
! 					prweek(cal[i], 2)
! 				print _spacing,
! 			print
  
- # Unrelated but handy function to calculate Unix timestamp from GMT
  EPOCH = 1970
  def timegm(tuple):
! 	year, month, day, hour, minute, second = tuple[:6]
! 	assert year >= EPOCH
! 	assert 1 <= month <= 12
! 	days = 365*(year-EPOCH) + leapdays(EPOCH, year)
! 	for i in range(1, month):
! 		days = days + mdays[i]
! 	if month > 2 and isleap(year):
! 		days = days + 1
! 	days = days + day - 1
! 	hours = days*24 + hour
! 	minutes = hours*60 + minute
! 	seconds = minutes*60 + second
! 	return seconds
--- 21,168 ----
  
  # Full and abbreviated names of weekdays
! day_name = ['Monday', 'Tuesday', 'Wednesday', 'Thursday',
!             'Friday', 'Saturday', 'Sunday']
  day_abbr = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
  
  # Full and abbreviated names of months (1-based arrays!!!)
! month_name = ['', 'January', 'February', 'March', 'April',
!               'May', 'June', 'July', 'August',
!               'September', 'October',  'November', 'December']
! month_abbr = ['   ', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
!               'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
  
  def isleap(year):
!     """Return 1 for leap years, 0 for non-leap years."""
!     return year % 4 == 0 and (year % 100 <> 0 or year % 400 == 0)
  
  def leapdays(y1, y2):
!     """Return number of leap years in range [y1, y2).
!     Assume y1 <= y2 and no funny (non-leap century) years."""
!     return (y2+3)/4 - (y1+3)/4
  
  def weekday(year, month, day):
!     """Return weekday (0-6 ~ Mon-Sun) for year (1970-...), month (1-12), day (1-31)."""
!     secs = mktime((year, month, day, 0, 0, 0, 0, 0, 0))
!     tuple = localtime(secs)
!     return tuple[6]
  
  def monthrange(year, month):
!     """Return weekday (0-6 ~ Mon-Sun) and number of days (28-31) for year, month."""
!     if not 1 <= month <= 12: raise ValueError, 'bad month number'
!     day1 = weekday(year, month, 1)
!     ndays = mdays[month] + (month == February and isleap(year))
!     return day1, ndays
  
  def _monthcalendar(year, month):
!     """Return a matrix representing a month's calendar.
!     Each row represents a week; days outside this month are zero."""
!     day1, ndays = monthrange(year, month)
!     rows = []
!     r7 = range(7)
!     day = 1 - day1
!     while day <= ndays:
!         row = [0, 0, 0, 0, 0, 0, 0]
!         for i in r7:
!             if 1 <= day <= ndays: row[i] = day
!             day = day + 1
!         rows.append(row)
!     return rows
  
  _mc_cache = {}
  def monthcalendar(year, month):
!     """Caching interface to _monthcalendar."""
!     key = (year, month)
!     if _mc_cache.has_key(key):
!         return _mc_cache[key]
!     else:
!         _mc_cache[key] = ret = _monthcalendar(year, month)
!         return ret
  
  def _center(str, width):
!     """Center a string in a field."""
!     n = width - len(str)
!     if n <= 0: return str
!     return ' '*((n+1)/2) + str + ' '*((n)/2)
  
  # XXX The following code knows that print separates items with space!
  
  def prweek(week, width):
!     """Print a single week (no newline)."""
!     for day in week:
!         if day == 0: s = ''
!         else: s = `day`
!         print _center(s, width),
  
  def weekheader(width):
!     """Return a header for a week."""
!     str = ''
!     if width >= 9: names = day_name
!     else: names = day_abbr
!     for i in range(7):
!         if str: str = str + ' '
!         str = str + _center(names[i%7][:width], width)
!     return str
  
  def prmonth(year, month, w = 0, l = 0):
!     """Print a month's calendar."""
!     w = max(2, w)
!     l = max(1, l)
!     print _center(month_name[month] + ' ' + `year`, 7*(w+1) - 1),
!     print '\n'*l,
!     print weekheader(w),
!     print '\n'*l,
!     for week in monthcalendar(year, month):
!         prweek(week, w)
!         print '\n'*l,
  
  # Spacing of month columns
! _colwidth = 7*3 - 1         # Amount printed by prweek()
! _spacing = ' '*4            # Spaces between columns
  
  def format3c(a, b, c):
!     """3-column formatting for year calendars"""
!     print _center(a, _colwidth),
!     print _spacing,
!     print _center(b, _colwidth),
!     print _spacing,
!     print _center(c, _colwidth)
  
  def prcal(year):
!     """Print a year's calendar."""
!     header = weekheader(2)
!     format3c('', `year`, '')
!     for q in range(January, January+12, 3):
!         print
!         format3c(month_name[q], month_name[q+1], month_name[q+2])
!         format3c(header, header, header)
!         data = []
!         height = 0
!         for month in range(q, q+3):
!             cal = monthcalendar(year, month)
!             if len(cal) > height: height = len(cal)
!             data.append(cal)
!         for i in range(height):
!             for cal in data:
!                 if i >= len(cal):
!                     print ' '*_colwidth,
!                 else:
!                     prweek(cal[i], 2)
!                 print _spacing,
!             print
  
  EPOCH = 1970
  def timegm(tuple):
!     """Unrelated but handy function to calculate Unix timestamp from GMT."""
!     year, month, day, hour, minute, second = tuple[:6]
!     assert year >= EPOCH
!     assert 1 <= month <= 12
!     days = 365*(year-EPOCH) + leapdays(EPOCH, year)
!     for i in range(1, month):
!         days = days + mdays[i]
!     if month > 2 and isleap(year):
!         days = days + 1
!     days = days + day - 1
!     hours = days*24 + hour
!     minutes = hours*60 + minute
!     seconds = minutes*60 + second
!     return seconds

Index: binhex.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/binhex.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** binhex.py	1998/03/26 20:34:13	1.10
--- binhex.py	2000/02/02 15:10:14	1.11
***************
*** 1,3 ****
--- 1,4 ----
  """binhex - Macintosh binhex compression/decompression
+ 
  easy interface:
  binhex(inputfilename, outputfilename)
***************
*** 26,30 ****
  import string
  import binascii
! 	
[...982 lines suppressed...]
!         nfinfo.Flags = finfo.Flags
!         ofss.SetFInfo(nfinfo)
!     
!     ifp.close()
  
  def _test():
!     if os.name == 'mac':
!         fss, ok = macfs.PromptGetFile('File to convert:')
!         if not ok:
!             sys.exit(0)
!         fname = fss.as_pathname()
!     else:
!         fname = sys.argv[1]
!     binhex(fname, fname+'.hqx')
!     hexbin(fname+'.hqx', fname+'.viahqx')
!     #hexbin(fname, fname+'.unpacked')
!     sys.exit(1)
!     
  if __name__ == '__main__':
!     _test()

Index: bdb.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/bdb.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** bdb.py	2000/01/19 21:57:30	1.26
--- bdb.py	2000/02/02 15:10:14	1.27
***************
*** 1,3 ****
! # Debugger basics
  
  import sys
--- 1,3 ----
! """Debugger basics"""
  
  import sys
***************
*** 9,474 ****
  
[...1079 lines suppressed...]
!         line = linecache.getline(fn, frame.f_lineno)
!         print '+++', fn, frame.f_lineno, name, ':', string.strip(line)
!     def user_return(self, frame, retval):
!         print '+++ return', retval
!     def user_exception(self, frame, exc_stuff):
!         print '+++ exception', exc_stuff
!         self.set_continue()
  
  def foo(n):
!     print 'foo(', n, ')'
!     x = bar(n*10)
!     print 'bar returned', x
  
  def bar(a):
!     print 'bar(', a, ')'
!     return a/2
  
  def test():
!     t = Tdb()
!     t.run('import bdb; bdb.foo(10)')

Index: base64.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/base64.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** base64.py	2000/01/03 15:44:40	1.8
--- base64.py	2000/02/02 15:10:14	1.9
***************
*** 1,6 ****
  #! /usr/bin/env python
  
! # Conversions to/from base64 transport encoding as per RFC-1521.
! #
  # Modified 04-Oct-95 by Jack to use binascii module
  
--- 1,6 ----
  #! /usr/bin/env python
  
! """Conversions to/from base64 transport encoding as per RFC-1521."""
! 
  # Modified 04-Oct-95 by Jack to use binascii module
  
***************
*** 10,77 ****
  MAXBINSIZE = (MAXLINESIZE/4)*3
  
- # Encode a file.
  def encode(input, output):
! 	while 1:
! 		s = input.read(MAXBINSIZE)
! 		if not s: break
! 		while len(s) < MAXBINSIZE:
! 		    ns = input.read(MAXBINSIZE-len(s))
! 		    if not ns: break
! 		    s = s + ns
! 		line = binascii.b2a_base64(s)
! 		output.write(line)
  
- # Decode a file.
  def decode(input, output):
! 	while 1:
! 		line = input.readline()
! 		if not line: break
! 		s = binascii.a2b_base64(line)
! 		output.write(s)
  
  def encodestring(s):
! 	import StringIO
! 	f = StringIO.StringIO(s)
! 	g = StringIO.StringIO()
! 	encode(f, g)
! 	return g.getvalue()
  
  def decodestring(s):
! 	import StringIO
! 	f = StringIO.StringIO(s)
! 	g = StringIO.StringIO()
! 	decode(f, g)
! 	return g.getvalue()
  
- # Small test program
  def test():
! 	import sys, getopt
! 	try:
! 		opts, args = getopt.getopt(sys.argv[1:], 'deut')
! 	except getopt.error, msg:
! 		sys.stdout = sys.stderr
! 		print msg
! 		print """usage: basd64 [-d] [-e] [-u] [-t] [file|-]
! 		-d, -u: decode
! 		-e: encode (default)
! 		-t: decode string 'Aladdin:open sesame'"""
! 		sys.exit(2)
! 	func = encode
! 	for o, a in opts:
! 		if o == '-e': func = encode
! 		if o == '-d': func = decode
! 		if o == '-u': func = decode
! 		if o == '-t': test1(); return
! 	if args and args[0] != '-':
! 		func(open(args[0], 'rb'), sys.stdout)
! 	else:
! 		func(sys.stdin, sys.stdout)
  
  def test1():
! 	s0 = "Aladdin:open sesame"
! 	s1 = encodestring(s0)
! 	s2 = decodestring(s1)
! 	print s0, `s1`, s2
  
  if __name__ == '__main__':
! 	test()
--- 10,79 ----
  MAXBINSIZE = (MAXLINESIZE/4)*3
  
  def encode(input, output):
!     """Encode a file."""
!     while 1:
!         s = input.read(MAXBINSIZE)
!         if not s: break
!         while len(s) < MAXBINSIZE:
!             ns = input.read(MAXBINSIZE-len(s))
!             if not ns: break
!             s = s + ns
!         line = binascii.b2a_base64(s)
!         output.write(line)
  
  def decode(input, output):
!     """Decode a file."""
!     while 1:
!         line = input.readline()
!         if not line: break
!         s = binascii.a2b_base64(line)
!         output.write(s)
  
  def encodestring(s):
!     """Encode a string."""
!     import StringIO
!     f = StringIO.StringIO(s)
!     g = StringIO.StringIO()
!     encode(f, g)
!     return g.getvalue()
  
  def decodestring(s):
!     """Decode a string."""
!     import StringIO
!     f = StringIO.StringIO(s)
!     g = StringIO.StringIO()
!     decode(f, g)
!     return g.getvalue()
  
  def test():
!     """Small test program"""
!     import sys, getopt
!     try:
!         opts, args = getopt.getopt(sys.argv[1:], 'deut')
!     except getopt.error, msg:
!         sys.stdout = sys.stderr
!         print msg
!         print """usage: basd64 [-d] [-e] [-u] [-t] [file|-]
!         -d, -u: decode
!         -e: encode (default)
!         -t: decode string 'Aladdin:open sesame'"""
!         sys.exit(2)
!     func = encode
!     for o, a in opts:
!         if o == '-e': func = encode
!         if o == '-d': func = decode
!         if o == '-u': func = decode
!         if o == '-t': test1(); return
!     if args and args[0] != '-':
!         func(open(args[0], 'rb'), sys.stdout)
!     else:
!         func(sys.stdin, sys.stdout)
  
  def test1():
!     s0 = "Aladdin:open sesame"
!     s1 = encodestring(s0)
!     s2 = decodestring(s1)
!     print s0, `s1`, s2
  
  if __name__ == '__main__':
!     test()

Index: aifc.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/aifc.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** aifc.py	1999/08/26 15:50:43	1.34
--- aifc.py	2000/02/02 15:10:15	1.35
***************
*** 1,137 ****
! # Stuff to parse AIFF-C and AIFF files.
! #
! # Unless explicitly stated otherwise, the description below is true
! # both for AIFF-C files and AIFF files.
! #
! # An AIFF-C file has the following structure.
! #
! #	+-----------------+
! #	| FORM            |
! #	+-----------------+
[...1887 lines suppressed...]
!     print "Reading", fn
!     print "nchannels =", f.getnchannels()
!     print "nframes   =", f.getnframes()
!     print "sampwidth =", f.getsampwidth()
!     print "framerate =", f.getframerate()
!     print "comptype  =", f.getcomptype()
!     print "compname  =", f.getcompname()
!     if sys.argv[2:]:
!         gn = sys.argv[2]
!         print "Writing", gn
!         g = open(gn, 'w')
!         g.setparams(f.getparams())
!         while 1:
!             data = f.readframes(1024)
!             if not data:
!                 break
!             g.writeframes(data)
!         g.close()
!         f.close()
!         print "Done."



From fdrake@weyr.cnri.reston.va.us  Wed Feb  2 16:30:48 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 2 Feb 2000 11:30:48 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libmarshal.tex,1.16,1.16.4.1
Message-ID: <200002021630.LAA00871@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libmarshal.tex 
Log Message:

In the descriptions of dump() and load(), point out that the file has
to be opened in binary mode.


Index: libmarshal.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libmarshal.tex,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -C2 -r1.16 -r1.16.4.1
*** libmarshal.tex	1999/04/22 21:23:21	1.16
--- libmarshal.tex	2000/02/02 16:30:44	1.16.4.1
***************
*** 63,67 ****
    type.  The file must be an open file object such as
    \code{sys.stdout} or returned by \function{open()} or
!   \function{posix.popen()}.
  
    If the value has (or contains an object that has) an unsupported type,
--- 63,68 ----
    type.  The file must be an open file object such as
    \code{sys.stdout} or returned by \function{open()} or
!   \function{posix.popen()}.  It must be opened in binary mode
!   (\code{'wb'} or \code{'w+b'}).
  
    If the value has (or contains an object that has) an unsupported type,
***************
*** 74,78 ****
    Read one value from the open file and return it.  If no valid value
    is read, raise \exception{EOFError}, \exception{ValueError} or
!   \exception{TypeError}.  The file must be an open file object.
  
    \strong{Warning:} If an object containing an unsupported type was
--- 75,80 ----
    Read one value from the open file and return it.  If no valid value
    is read, raise \exception{EOFError}, \exception{ValueError} or
!   \exception{TypeError}.  The file must be an open file object opened
!   in binary mode (\code{'rb'} or \code{'r+b'}).
  
    \strong{Warning:} If an object containing an unsupported type was



From guido@cnri.reston.va.us  Wed Feb  2 16:51:09 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 2 Feb 2000 11:51:09 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib gzip.py,1.14,1.15
Message-ID: <200002021651.LAA22922@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	gzip.py 
Log Message:
Make read() and readlines() conform more to the file object interface:
the default arg for read() is -1, not None, and readlines() has an
optional argument (which for now is ignored).


Index: gzip.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/gzip.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** gzip.py	1999/09/06 16:34:51	1.14
--- gzip.py	2000/02/02 16:51:06	1.15
***************
*** 140,149 ****
          self.write(string.join(lines))
  
!     def read(self, size=None):
          if self.extrasize <= 0 and self.fileobj is None:
              return ''
  
          readsize = 1024
!         if not size:        # get the whole thing
              try:
                  while 1:
--- 140,149 ----
          self.write(string.join(lines))
  
!     def read(self, size=-1):
          if self.extrasize <= 0 and self.fileobj is None:
              return ''
  
          readsize = 1024
!         if size < 0:        # get the whole thing
              try:
                  while 1:
***************
*** 282,286 ****
              readsize = readsize * 2
  
!     def readlines(self):
          buf = self.read()
          lines = string.split(buf, '\n')
--- 282,286 ----
              readsize = readsize * 2
  
!     def readlines(self, ignored=None):
          buf = self.read()
          lines = string.split(buf, '\n')



From guido@cnri.reston.va.us  Wed Feb  2 16:54:42 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 2 Feb 2000 11:54:42 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib ntpath.py,1.21,1.22
Message-ID: <200002021654.LAA22950@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	ntpath.py 
Log Message:
Optimize abspath() slightly for the case that win32api can't be
imported; in that case, abspath is replaced by a fallback version.


Index: ntpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ntpath.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** ntpath.py	1999/11/30 15:00:00	1.21
--- ntpath.py	2000/02/02 16:54:39	1.22
***************
*** 404,413 ****
      try:
          import win32api
-         try:
-             path = win32api.GetFullPathName(path)
-         except win32api.error:
-             pass # Bad path - return unchanged.
      except ImportError:
!         if not isabs(path):
!             path = join(os.getcwd(), path)
      return normpath(path)
--- 404,418 ----
      try:
          import win32api
      except ImportError:
!         global abspath
!         def _abspath(path):
!             if not isabs(path):
!                 path = join(os.getcwd(), path)
!             return normpath(path)
!         abspath = _abspath
!         return _abspath(path)
!     try:
!         path = win32api.GetFullPathName(path)
!     except win32api.error:
!         pass # Bad path - return unchanged.
      return normpath(path)



From guido@cnri.reston.va.us  Wed Feb  2 16:57:34 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 2 Feb 2000 11:57:34 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/plat-win socket.py,1.6,1.7
Message-ID: <200002021657.LAA22978@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/plat-win
In directory eric:/projects/python/develop/guido/src/Lib/plat-win

Modified Files:
	socket.py 
Log Message:
In _fileobject, optimize read() a bit (it could be really slow), and
remove "import string" -- use string methods instead!


Index: socket.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/plat-win/socket.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** socket.py	1998/05/06 13:48:04	1.6
--- socket.py	2000/02/02 16:57:32	1.7
***************
*** 97,125 ****
  	def read(self, n=-1):
  		if n >= 0:
! 			while len(self._rbuf) < n:
! 				new = self._sock.recv(self._rbufsize)
  				if not new: break
! 				self._rbuf = self._rbuf + new
! 			data, self._rbuf = self._rbuf[:n], self._rbuf[n:]
! 			return data
  		while 1:
! 			new = self._sock.recv(self._rbufsize)
  			if not new: break
! 			self._rbuf = self._rbuf + new
! 		data, self._rbuf = self._rbuf, ""
! 		return data
  
! 	def readline(self):
! 		import string
  		data = ""
! 		i = string.find(self._rbuf, '\n')
! 		while i < 0:
  			new = self._sock.recv(self._rbufsize)
  			if not new: break
! 			i = string.find(new, '\n')
  			if i >= 0: i = i + len(self._rbuf)
  			self._rbuf = self._rbuf + new
  		if i < 0: i = len(self._rbuf)
  		else: i = i+1
  		data, self._rbuf = self._rbuf[:i], self._rbuf[i:]
  		return data
--- 97,141 ----
  	def read(self, n=-1):
  		if n >= 0:
! 			k = len(self._rbuf)
! 			if n <= k:
! 				data = self._rbuf[:n]
! 				self._rbuf = self._rbuf[n:]
! 				return data
! 			n = n - k
! 			l = [self._rbuf]
! 			self._rbuf = ""
! 			while n > 0:
! 				new = self._sock.recv(max(n, self._rbufsize))
  				if not new: break
! 				k = len(new)
! 				if k > n:
! 					l.append(new[:n])
! 					self._rbuf = new[n:]
! 					break
! 				l.append(new)
! 				n = n - k
! 			return "".join(l)
! 		k = max(512, self._rbufsize)
! 		l = [self._rbuf]
! 		self._rbuf = ""
  		while 1:
! 			new = self._sock.recv(k)
  			if not new: break
! 			l.append(new)
! 			k = min(k*2, 1024**2)
! 		return "".join(l)
  
! 	def readline(self, limit=-1):
  		data = ""
! 		i = self._rbuf.find('\n')
! 		while i < 0 and not (0 < limit <= len(self._rbuf)):
  			new = self._sock.recv(self._rbufsize)
  			if not new: break
! 			i = new.find('\n')
  			if i >= 0: i = i + len(self._rbuf)
  			self._rbuf = self._rbuf + new
  		if i < 0: i = len(self._rbuf)
  		else: i = i+1
+ 		if 0 <= limit < len(self._rbuf): i = limit
  		data, self._rbuf = self._rbuf[:i], self._rbuf[i:]
  		return data



From guido@cnri.reston.va.us  Thu Feb  3 00:41:24 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 2 Feb 2000 19:41:24 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib filecmp.py,1.1,1.2
Message-ID: <200002030041.TAA25281@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	filecmp.py 
Log Message:
# module filecmp
# combo of old cmp, cmpcache and dircmp with redundancies removed
#
# bugs fixed:
#   dircmp.dircmp was not ignoring IGNORES
#   old stuff could falsely report files as "identical" when contents actually differed
#
# enhancements:
#   dircmp has a more straightforward interface
#cmp enhanced by Moshe Zadca
#dircmp enhanced byGordon McMillan

[some layout changes by GvR]


Index: filecmp.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/filecmp.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** filecmp.py	1999/10/26 14:02:01	1.1
--- filecmp.py	2000/02/03 00:41:22	1.2
***************
*** 1,57 ****
! """Compare files."""
  
! import os, stat, statcache
  
  _cache = {}
  BUFSIZE=8*1024
  
! def cmp(f1, f2, shallow=1,use_statcache=0): 
! 	"""Compare two files.
  
! 	Arguments:
  
! 	f1 -- First file name
  
! 	f2 -- Second file name
  
! 	shallow -- Just check stat signature (do not read the files).
! 	           defaults to 1.
  
! 	use_statcache -- Do not stat() each file directly: go through
! 	                 the statcache module for more efficiency.
  
! 	Return value:
  
! 	integer -- 1 if the files are the same, 0 otherwise.
  
! 	This function uses a cache for past comparisons and the results,
! 	with a cache invalidation mechanism relying on stale signatures.
! 	Of course, if 'use_statcache' is true, this mechanism is defeated,
! 	and the cache will never grow stale.
  
! 	"""
! 	stat_function = (os.stat, statcache.stat)[use_statcache]
! 	s1, s2 = _sig(stat_function(f1)), _sig(stat_function(f2))
! 	if s1[0]!=stat.S_IFREG or s2[0]!=stat.S_IFREG: return 0
! 	if shallow and s1 == s2: return 1
! 	if s1[1]!=s2[1]:         return 0
  
! 	result = _cache.get((f1, f2))
! 	if result and (s1, s2)==result[:2]:
! 		return result[2]
! 	outcome = _do_cmp(f1, f2)
! 	_cache[f1, f2] = s1, s2, outcome
! 	return outcome
  
  def _sig(st):
! 	return (stat.S_IFMT(st[stat.ST_MODE]), 
! 	        st[stat.ST_SIZE], 
! 	        st[stat.ST_MTIME])
  
  def _do_cmp(f1, f2):
! 	bufsize = BUFSIZE
! 	fp1 , fp2 = open(f1, 'rb'), open(f2, 'rb')
! 	while 1:
! 		b1, b2 = fp1.read(bufsize), fp2.read(bufsize)
! 		if b1!=b2: return 0
! 		if not b1: return 1
--- 1,318 ----
! """Utilities for comparing files and directories.
  
! Classes:
!     dircmp
  
+ Functions:
+     cmp(f1, f2, shallow=1, use_statcache=0) -> int
+     cmpfiles(a, b, common) -> ([], [], [])
+ 
+ """
+ 
+ import os
+ import stat
+ import statcache
+ 
  _cache = {}
  BUFSIZE=8*1024
  
! def cmp(f1, f2, shallow=1,use_statcache=0):
!     """Compare two files.
  
!     Arguments:
  
!     f1 -- First file name
  
!     f2 -- Second file name
  
!     shallow -- Just check stat signature (do not read the files).
!                defaults to 1.
  
!     use_statcache -- Do not stat() each file directly: go through
!                      the statcache module for more efficiency.
  
!     Return value:
  
!     integer -- 1 if the files are the same, 0 otherwise.
  
!     This function uses a cache for past comparisons and the results,
!     with a cache invalidation mechanism relying on stale signatures.
!     Of course, if 'use_statcache' is true, this mechanism is defeated,
!     and the cache will never grow stale.
  
!     """
!     stat_function = (os.stat, statcache.stat)[use_statcache]
!     s1, s2 = _sig(stat_function(f1)), _sig(stat_function(f2))
!     if s1[0]!=stat.S_IFREG or s2[0]!=stat.S_IFREG: return 0
!     if shallow and s1 == s2: return 1
!     if s1[1]!=s2[1]:         return 0
  
!     result = _cache.get((f1, f2))
!     if result and (s1, s2)==result[:2]:
!         return result[2]
!     outcome = _do_cmp(f1, f2)
!     _cache[f1, f2] = s1, s2, outcome
!     return outcome
  
  def _sig(st):
!     return (stat.S_IFMT(st[stat.ST_MODE]),
!             st[stat.ST_SIZE],
!             st[stat.ST_MTIME])
  
  def _do_cmp(f1, f2):
!     bufsize = BUFSIZE
!     fp1 , fp2 = open(f1, 'rb'), open(f2, 'rb')
!     while 1:
!         b1, b2 = fp1.read(bufsize), fp2.read(bufsize)
!         if b1!=b2: return 0
!         if not b1: return 1
! 
! # Directory comparison class.
! #
! class dircmp:
!     """A class that manages the comparison of 2 directories.
! 
!     dircmp(a,b,ignore=None,hide=None)
!       A and B are directories.
!       IGNORE is a list of names to ignore,
!         defaults to ['RCS', 'CVS', 'tags'].
!       HIDE is a list of names to hide,
!         defaults to [os.curdir, os.pardir].
! 
!     High level usage:
!       x = dircmp(dir1, dir2)
!       x.report() -> prints a report on the differences between dir1 and dir2
!        or
!       x.report_partial_closure() -> prints report on differences between dir1
!             and dir2, and reports on common immediate subdirectories.
!       x.report_full_closure() -> like report_partial_closure,
!             but fully recursive.
! 
!     Attributes:
!      left_list, right_list: The files in dir1 and dir2,
!         filtered by hide and ignore.
!      common: a list of names in both dir1 and dir2.
!      left_only, right_only: names only in dir1, dir2.
!      common_dirs: subdirectories in both dir1 and dir2.
!      common_files: files in both dir1 and dir2.
!      common_funny: names in both dir1 and dir2 where the type differs between
!         dir1 and dir2, or the name is not stat-able.
!      same_files: list of identical files.
!      diff_files: list of filenames which differ.
!      funny_files: list of files which could not be compared.
!      subdirs: a dictionary of dircmp objects, keyed by names in common_dirs.
!      """
! 
!     def __init__(self, a, b, ignore=None, hide=None): # Initialize
!         self.left = a
!         self.right = b
!         if hide is None:
!             self.hide = [os.curdir, os.pardir] # Names never to be shown
!         else:
!             self.hide = hide
!         if ignore is None:
!             self.ignore = ['RCS', 'CVS', 'tags'] # Names ignored in comparison
!         else:
!             self.ignore = ignore
! 
!     def phase0(self): # Compare everything except common subdirectories
!         self.left_list = _filter(os.listdir(self.left),
!                                  self.hide+self.ignore)
!         self.right_list = _filter(os.listdir(self.right),
!                                   self.hide+self.ignore)
!         self.left_list.sort()
!         self.right_list.sort()
! 
!     __p4_attrs = ('subdirs',)
!     __p3_attrs = ('same_files', 'diff_files', 'funny_files')
!     __p2_attrs = ('common_dirs', 'common_files', 'common_funny')
!     __p1_attrs = ('common', 'left_only', 'right_only')
!     __p0_attrs = ('left_list', 'right_list')
! 
!     def __getattr__(self, attr):
!         if attr in self.__p4_attrs:
!             self.phase4()
!         elif attr in self.__p3_attrs:
!             self.phase3()
!         elif attr in self.__p2_attrs:
!             self.phase2()
!         elif attr in self.__p1_attrs:
!             self.phase1()
!         elif attr in self.__p0_attrs:
!             self.phase0()
!         else:
!             raise AttributeError, attr
!         return getattr(self, attr)
! 
!     def phase1(self): # Compute common names
!         a_only, b_only = [], []
!         common = {}
!         b = {}
!         for fnm in self.right_list:
!             b[fnm] = 1
!         for x in self.left_list:
!             if b.get(x, 0):
!                 common[x] = 1
!             else:
!                 a_only.append(x)
!         for x in self.right_list:
!             if common.get(x, 0):
!                 pass
!             else:
!                 b_only.append(x)
!         self.common = common.keys()
!         self.left_only = a_only
!         self.right_only = b_only
! 
!     def phase2(self): # Distinguish files, directories, funnies
!         self.common_dirs = []
!         self.common_files = []
!         self.common_funny = []
! 
!         for x in self.common:
!             a_path = os.path.join(self.left, x)
!             b_path = os.path.join(self.right, x)
! 
!             ok = 1
!             try:
!                 a_stat = statcache.stat(a_path)
!             except os.error, why:
!                 # print 'Can\'t stat', a_path, ':', why[1]
!                 ok = 0
!             try:
!                 b_stat = statcache.stat(b_path)
!             except os.error, why:
!                 # print 'Can\'t stat', b_path, ':', why[1]
!                 ok = 0
! 
!             if ok:
!                 a_type = stat.S_IFMT(a_stat[stat.ST_MODE])
!                 b_type = stat.S_IFMT(b_stat[stat.ST_MODE])
!                 if a_type <> b_type:
!                     self.common_funny.append(x)
!                 elif stat.S_ISDIR(a_type):
!                     self.common_dirs.append(x)
!                 elif stat.S_ISREG(a_type):
!                     self.common_files.append(x)
!                 else:
!                     self.common_funny.append(x)
!             else:
!                 self.common_funny.append(x)
! 
!     def phase3(self): # Find out differences between common files
!         xx = cmpfiles(self.left, self.right, self.common_files)
!         self.same_files, self.diff_files, self.funny_files = xx
! 
!     def phase4(self): # Find out differences between common subdirectories
!         # A new dircmp object is created for each common subdirectory,
!         # these are stored in a dictionary indexed by filename.
!         # The hide and ignore properties are inherited from the parent
!         self.subdirs = {}
!         for x in self.common_dirs:
!             a_x = os.path.join(self.left, x)
!             b_x = os.path.join(self.right, x)
!             self.subdirs[x]  = dircmp(a_x, b_x, self.ignore, self.hide)
! 
!     def phase4_closure(self): # Recursively call phase4() on subdirectories
!         self.phase4()
!         for x in self.subdirs.keys():
!             self.subdirs[x].phase4_closure()
! 
!     def report(self): # Print a report on the differences between a and b
!         # Output format is purposely lousy
!         print 'diff', self.left, self.right
!         if self.left_only:
!             self.left_only.sort()
!             print 'Only in', self.left, ':', self.left_only
!         if self.right_only:
!             self.right_only.sort()
!             print 'Only in', self.right, ':', self.right_only
!         if self.same_files:
!             self.same_files.sort()
!             print 'Identical files :', self.same_files
!         if self.diff_files:
!             self.diff_files.sort()
!             print 'Differing files :', self.diff_files
!         if self.funny_files:
!             self.funny_files.sort()
!             print 'Trouble with common files :', self.funny_files
!         if self.common_dirs:
!             self.common_dirs.sort()
!             print 'Common subdirectories :', self.common_dirs
!         if self.common_funny:
!             self.common_funny.sort()
!             print 'Common funny cases :', self.common_funny
! 
!     def report_partial_closure(self): # Print reports on self and on subdirs
!         self.report()
!         for x in self.subdirs.keys():
!             print
!             self.subdirs[x].report()
! 
!     def report_full_closure(self): # Report on self and subdirs recursively
!         self.report()
!         for x in self.subdirs.keys():
!             print
!             self.subdirs[x].report_full_closure()
! 
! 
! # Compare common files in two directories.
! # Return:
! #	- files that compare equal
! #	- files that compare different
! #	- funny cases (can't stat etc.)
! #
! def cmpfiles(a, b, common):
!     """Compare common files in two directories.
! 
!     cmpfiles(a,b,common)
!       A and B are directory names
!       COMMON is a list of file names
!     returns a tuple of three lists:
!       files that compare equal
!       files that are different
!       filenames that aren't regular files."""
! 
!     res = ([], [], [])
!     for x in common:
!         res[_cmp(os.path.join(a, x), os.path.join(b, x))].append(x)
!     return res
! 
! 
! # Compare two files.
! # Return:
! #	0 for equal
! #	1 for different
! #	2 for funny cases (can't stat, etc.)
! #
! def _cmp(a, b):
!     try:
!         return not abs(cmp(a, b))
!     except os.error:
!         return 2
! 
! 
! # Return a copy with items that occur in skip removed.
! #
! def _filter(list, skip):
!     result = []
!     for item in list:
!         if item not in skip: result.append(item)
!     return result
! 
! 
! # Demonstration and testing.
! #
! def demo():
!     import sys
!     import getopt
!     options, args = getopt.getopt(sys.argv[1:], 'r')
!     if len(args) <> 2: raise getopt.error, 'need exactly two args'
!     dd = dircmp(args[0], args[1])
!     if ('-r', '') in options:
!         dd.report_full_closure()
!     else:
!         dd.report()
! 
! if __name__ == '__main__':
!     demo()



From guido@cnri.reston.va.us  Thu Feb  3 13:42:53 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 3 Feb 2000 08:42:53 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src configure.in,1.114,1.115
Message-ID: <200002031342.IAA26792@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src
In directory eric:/projects/python/develop/guido/src

Modified Files:
	configure.in 
Log Message:
According to Harri Pasanen, the Solaris+gcc test for LINKFORSHARED
needed an adaptation for the latest gcc -- we need to grep stderr as
well as stdout for the magic string BFD.  (Does anybody know what BFD
means?)


Index: configure.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** configure.in	1999/12/20 21:27:22	1.114
--- configure.in	2000/02/03 13:42:50	1.115
***************
*** 1,4 ****
  dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.114 $)
  AC_PREREQ(2.0)
  AC_INIT(Include/object.h)
--- 1,4 ----
  dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.115 $)
  AC_PREREQ(2.0)
  AC_INIT(Include/object.h)
***************
*** 566,570 ****
  	SunOS/5*) case $CC in
  		  *gcc*)
! 		    if $CC -Xlinker -V 2>/dev/null | grep BFD >/dev/null
  		    then
  			LINKFORSHARED="-Xlinker --export-dynamic"
--- 566,570 ----
  	SunOS/5*) case $CC in
  		  *gcc*)
! 		    if $CC -Xlinker -V 2>&1 | grep BFD >/dev/null
  		    then
  			LINKFORSHARED="-Xlinker --export-dynamic"



From guido@cnri.reston.va.us  Thu Feb  3 13:50:27 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 3 Feb 2000 08:50:27 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src configure,1.106,1.107
Message-ID: <200002031350.IAA27300@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src
In directory eric:/projects/python/develop/guido/src

Modified Files:
	configure 
Log Message:
According to Harri Pasanen, the Solaris+gcc test for LINKFORSHARED
needed an adaptation for the latest gcc -- we need to grep stderr as
well as stdout for the magic string BFD.  (Does anybody know what BFD
means?)


Index: configure
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -r1.106 -r1.107
*** configure	1999/12/20 21:27:22	1.106
--- configure	2000/02/03 13:50:24	1.107
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.114 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.115 
  
  # Guess values for system-dependent variables and create Makefiles.
***************
*** 2356,2360 ****
  	SunOS/5*) case $CC in
  		  *gcc*)
! 		    if $CC -Xlinker -V 2>/dev/null | grep BFD >/dev/null
  		    then
  			LINKFORSHARED="-Xlinker --export-dynamic"
--- 2356,2360 ----
  	SunOS/5*) case $CC in
  		  *gcc*)
! 		    if $CC -Xlinker -V 2>&1 | grep BFD >/dev/null
  		    then
  			LINKFORSHARED="-Xlinker --export-dynamic"



From gstein@lyra.org  Thu Feb  3 13:56:11 2000
From: gstein@lyra.org (Greg Stein)
Date: Thu, 3 Feb 2000 05:56:11 -0800 (PST)
Subject: [Python-checkins] CVS: python/dist/src configure,1.106,1.107
In-Reply-To: <200002031350.IAA27300@eric.cnri.reston.va.us>
Message-ID: <Pine.LNX.4.10.10002030555210.28358-100000@nebula.lyra.org>

In some contexts, it means "Big Fucking Deal". I doubt that is the meaning
in this situation, though.

:-)


On Thu, 3 Feb 2000, Guido van Rossum wrote:

> Update of /projects/cvsroot/python/dist/src
> In directory eric:/projects/python/develop/guido/src
> 
> Modified Files:
> 	configure 
> Log Message:
> According to Harri Pasanen, the Solaris+gcc test for LINKFORSHARED
> needed an adaptation for the latest gcc -- we need to grep stderr as
> well as stdout for the magic string BFD.  (Does anybody know what BFD
> means?)
> 
> 
> Index: configure
> ===================================================================
> RCS file: /projects/cvsroot/python/dist/src/configure,v
> retrieving revision 1.106
> retrieving revision 1.107
> diff -C2 -r1.106 -r1.107
> *** configure	1999/12/20 21:27:22	1.106
> --- configure	2000/02/03 13:50:24	1.107
> ***************
> *** 1,5 ****
>   #! /bin/sh
>   
> ! # From configure.in Revision: 1.114 
>   
>   # Guess values for system-dependent variables and create Makefiles.
> --- 1,5 ----
>   #! /bin/sh
>   
> ! # From configure.in Revision: 1.115 
>   
>   # Guess values for system-dependent variables and create Makefiles.
> ***************
> *** 2356,2360 ****
>   	SunOS/5*) case $CC in
>   		  *gcc*)
> ! 		    if $CC -Xlinker -V 2>/dev/null | grep BFD >/dev/null
>   		    then
>   			LINKFORSHARED="-Xlinker --export-dynamic"
> --- 2356,2360 ----
>   	SunOS/5*) case $CC in
>   		  *gcc*)
> ! 		    if $CC -Xlinker -V 2>&1 | grep BFD >/dev/null
>   		    then
>   			LINKFORSHARED="-Xlinker --export-dynamic"
> 
> 
> _______________________________________________
> Python-checkins mailing list
> Python-checkins@python.org
> http://www.python.org/mailman/listinfo/python-checkins
> 

-- 
Greg Stein, http://www.lyra.org/



From Vladimir.Marangozov@inrialpes.fr  Thu Feb  3 14:15:56 2000
From: Vladimir.Marangozov@inrialpes.fr (Vladimir Marangozov)
Date: Thu, 3 Feb 2000 15:15:56 +0100 (CET)
Subject: [Python-checkins] BFD
Message-ID: <200002031415.PAA09557@python.inrialpes.fr>

Oops, my "pycvs" alias wasn't set and the Cc: failed.

Forwarded message:
> From marangoz Thu Feb  3 15:11:02 2000
> Subject: Re: [Python-checkins] CVS: python/dist/src configure,1.106,1.107
> To: guido@cnri.reston.va.us (Guido van Rossum)
> Date: Thu, 3 Feb 2000 15:11:02 +0100 (CET)
> Cc: pycvs
> In-Reply-To: <200002031350.IAA27300@eric.cnri.reston.va.us> from "Guido van Rossum" at Feb 03, 2000 08:50:27 AM
> Reply-To: Vladimir.Marangozov@inrialpes.fr
> X-Mailer: ELM [version 2.5 PL1]
> Content-Length: 898       
> 
> Guido van Rossum wrote:
> > 
> > Update of /projects/cvsroot/python/dist/src
> > In directory eric:/projects/python/develop/guido/src
> > 
> > Modified Files:
> > 	configure 
> > Log Message:
> > According to Harri Pasanen, the Solaris+gcc test for LINKFORSHARED
> > needed an adaptation for the latest gcc -- we need to grep stderr as
> > well as stdout for the magic string BFD.  (Does anybody know what BFD
> > means?)
> 
> BFD stands for Binary File Descriptor. It's 1) a library used by most GNU
> tools, especially in GNU binutils, and more precisely 2) an internal format/
> structure + an interface allowing different tools to manipulate object files
> in a uniform way.
> 
> I don't know how this relates to the build on Solaris + GCC, so I'm
> trusting Harri and you for that...
> 
> -- 
>        Vladimir MARANGOZOV          | Vladimir.Marangozov@inrialpes.fr
> http://sirac.inrialpes.fr/~marangoz | tel:(+33-4)76615277 fax:76615252
> 


-- 
       Vladimir MARANGOZOV          | Vladimir.Marangozov@inrialpes.fr
http://sirac.inrialpes.fr/~marangoz | tel:(+33-4)76615277 fax:76615252


From fdrake@weyr.cnri.reston.va.us  Thu Feb  3 15:25:35 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 3 Feb 2000 10:25:35 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/lib-old cmp.py,NONE,1.1 cmpcache.py,NONE,1.1 dircmp.py,NONE,1.1
Message-ID: <200002031525.KAA02769@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/lib-old
In directory weyr:/home/fdrake/projects/python/Lib/lib-old

Added Files:
	cmp.py cmpcache.py dircmp.py 
Log Message:
These modules are now declared obsolete.






From fdrake@weyr.cnri.reston.va.us  Thu Feb  3 15:26:19 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 3 Feb 2000 10:26:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib cmp.py,1.8,NONE cmpcache.py,1.8,NONE dircmp.py,1.8,NONE
Message-ID: <200002031526.KAA02800@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Removed Files:
	cmp.py cmpcache.py dircmp.py 
Log Message:
These modules are now declared obsolete.






From fdrake@weyr.cnri.reston.va.us  Thu Feb  3 15:27:29 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 3 Feb 2000 10:27:29 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libundoc.tex,1.71,1.72
Message-ID: <200002031527.KAA02833@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc/lib

Modified Files:
	libundoc.tex 
Log Message:

The dircmp module is now obsolete.


Index: libundoc.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libundoc.tex,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -r1.71 -r1.72
*** libundoc.tex	1999/12/01 18:44:09	1.71
--- libundoc.tex	2000/02/03 15:27:26	1.72
***************
*** 36,42 ****
  
  \begin{description}
- \item[\module{dircmp}]
- --- class to build directory diff tools on (may become a demo or tool)
- 
  \item[\module{bdb}]
  --- A generic Python debugger base class (used by pdb)
--- 36,39 ----
***************
*** 109,112 ****
--- 106,112 ----
  \member{co.co_name}, \member{func.func_name},
  \member{co.co_firstlineno}).
+ 
+ \item[\module{dircmp}]
+ --- class to build directory diff tools on (may become a demo or tool)
  
  \item[\module{dump}]



From guido@cnri.reston.va.us  Thu Feb  3 17:19:38 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 3 Feb 2000 12:19:38 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/PCbuild _tkinter.dsp,1.9,1.10 parser.dsp,1.5,1.6 python.dsp,1.7,1.8 python15.dsp,1.10,1.11 pythonw.dsp,1.6,1.7 zlib.dsp,1.7,1.8
Message-ID: <200002031719.MAA29329@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/PCbuild
In directory eric:/projects/python/develop/guido/src/PCbuild

Modified Files:
	_tkinter.dsp parser.dsp python.dsp python15.dsp pythonw.dsp 
	zlib.dsp 
Log Message:
Mark Hammond renames the x86 projects back to what they were named
before the patch by Trent Mick.  Since he now also works for
ActiveState, I suppose he overrides Trent. :-)


Index: _tkinter.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/_tkinter.dsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** _tkinter.dsp	2000/01/21 00:03:42	1.9
--- _tkinter.dsp	2000/02/03 17:19:35	1.10
***************
*** 21,26 ****
  !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
--- 21,26 ----
  !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
***************
*** 30,34 ****
  # PROP Scc_LocalPath "..\..\.."
  
! !IF  "$(CFG)" == "_tkinter - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath "..\..\.."
  
! !IF  "$(CFG)" == "_tkinter - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 61,65 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 61,65 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 160,165 ****
  # Begin Target
  
! # Name "_tkinter - Win32 x86 Release"
! # Name "_tkinter - Win32 x86 Debug"
  # Name "_tkinter - Win32 Alpha Debug"
  # Name "_tkinter - Win32 Alpha Release"
--- 160,165 ----
  # Begin Target
  
! # Name "_tkinter - Win32 Release"
! # Name "_tkinter - Win32 Debug"
  # Name "_tkinter - Win32 Alpha Debug"
  # Name "_tkinter - Win32 Alpha Release"
***************
*** 168,174 ****
  SOURCE=..\Modules\_tkinter.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
--- 168,174 ----
  SOURCE=..\Modules\_tkinter.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
***************
*** 183,189 ****
  SOURCE=..\Modules\tkappinit.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
--- 183,189 ----
  SOURCE=..\Modules\tkappinit.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"

Index: parser.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/parser.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** parser.dsp	2000/01/20 21:31:41	1.5
--- parser.dsp	2000/02/03 17:19:35	1.6
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "parser - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "parser - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "parser - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "parser - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "parser - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "parser - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "parser - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "parser - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
***************
*** 30,34 ****
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "parser - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "parser - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 61,65 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "parser - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 61,65 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "parser - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 160,165 ****
  # Begin Target
  
! # Name "parser - Win32 x86 Release"
! # Name "parser - Win32 x86 Debug"
  # Name "parser - Win32 Alpha Debug"
  # Name "parser - Win32 Alpha Release"
--- 160,165 ----
  # Begin Target
  
! # Name "parser - Win32 Release"
! # Name "parser - Win32 Debug"
  # Name "parser - Win32 Alpha Debug"
  # Name "parser - Win32 Alpha Release"
***************
*** 168,174 ****
  SOURCE=..\Modules\parsermodule.c
  
! !IF  "$(CFG)" == "parser - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "parser - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "parser - Win32 Alpha Debug"
--- 168,174 ----
  SOURCE=..\Modules\parsermodule.c
  
! !IF  "$(CFG)" == "parser - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "parser - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "parser - Win32 Alpha Debug"

Index: python.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/python.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** python.dsp	2000/01/20 21:31:41	1.7
--- python.dsp	2000/02/03 17:19:35	1.8
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "python - Win32 x86 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "python - Win32 x86 Debug" (based on "Win32 (x86) Console Application")
  !MESSAGE "python - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
  !MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "python - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "python - Win32 Debug" (based on "Win32 (x86) Console Application")
  !MESSAGE "python - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
  !MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
***************
*** 30,34 ****
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "python - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "python - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 56,60 ****
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release"
  
! !ELSEIF  "$(CFG)" == "python - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 56,60 ----
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release"
  
! !ELSEIF  "$(CFG)" == "python - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 140,145 ****
  # Begin Target
  
! # Name "python - Win32 x86 Release"
! # Name "python - Win32 x86 Debug"
  # Name "python - Win32 Alpha Debug"
  # Name "python - Win32 Alpha Release"
--- 140,145 ----
  # Begin Target
  
! # Name "python - Win32 Release"
! # Name "python - Win32 Debug"
  # Name "python - Win32 Alpha Debug"
  # Name "python - Win32 Alpha Release"
***************
*** 152,158 ****
  SOURCE=..\Modules\python.c
  
! !IF  "$(CFG)" == "python - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "python - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"
--- 152,158 ----
  SOURCE=..\Modules\python.c
  
! !IF  "$(CFG)" == "python - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "python - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"

Index: python15.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/python15.dsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** python15.dsp	2000/01/20 21:31:41	1.10
--- python15.dsp	2000/02/03 17:19:35	1.11
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "python15 - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "python15 - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "python15 - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "python15 - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "python15 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
[...1694 lines suppressed...]
! !ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
***************
*** 1637,1643 ****
  SOURCE=..\Modules\yuvconvert.c
  
! !IF  "$(CFG)" == "python15 - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
--- 1637,1643 ----
  SOURCE=..\Modules\yuvconvert.c
  
! !IF  "$(CFG)" == "python15 - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"

Index: pythonw.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/pythonw.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pythonw.dsp	2000/01/20 21:31:41	1.6
--- pythonw.dsp	2000/02/03 17:19:35	1.7
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "pythonw - Win32 x86 Release" (based on "Win32 (x86) Application")
! !MESSAGE "pythonw - Win32 x86 Debug" (based on "Win32 (x86) Application")
  !MESSAGE "pythonw - Win32 Alpha Debug" (based on "Win32 (ALPHA) Application")
  !MESSAGE "pythonw - Win32 Alpha Release" (based on "Win32 (ALPHA) Application")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "pythonw - Win32 Release" (based on "Win32 (x86) Application")
! !MESSAGE "pythonw - Win32 Debug" (based on "Win32 (x86) Application")
  !MESSAGE "pythonw - Win32 Alpha Debug" (based on "Win32 (ALPHA) Application")
  !MESSAGE "pythonw - Win32 Alpha Release" (based on "Win32 (ALPHA) Application")
***************
*** 30,34 ****
  # PROP Scc_LocalPath "..\pc"
  
! !IF  "$(CFG)" == "pythonw - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath "..\pc"
  
! !IF  "$(CFG)" == "pythonw - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 60,64 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "pythonw - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 60,64 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "pythonw - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 158,163 ****
  # Begin Target
  
! # Name "pythonw - Win32 x86 Release"
! # Name "pythonw - Win32 x86 Debug"
  # Name "pythonw - Win32 Alpha Debug"
  # Name "pythonw - Win32 Alpha Release"
--- 158,163 ----
  # Begin Target
  
! # Name "pythonw - Win32 Release"
! # Name "pythonw - Win32 Debug"
  # Name "pythonw - Win32 Alpha Debug"
  # Name "pythonw - Win32 Alpha Release"
***************
*** 170,176 ****
  SOURCE=..\PC\WinMain.c
  
! !IF  "$(CFG)" == "pythonw - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "pythonw - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "pythonw - Win32 Alpha Debug"
--- 170,176 ----
  SOURCE=..\PC\WinMain.c
  
! !IF  "$(CFG)" == "pythonw - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "pythonw - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "pythonw - Win32 Alpha Debug"

Index: zlib.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/zlib.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** zlib.dsp	2000/01/20 21:31:41	1.7
--- zlib.dsp	2000/02/03 17:19:35	1.8
***************
*** 5,9 ****
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
! CFG=zlib - Win32 x86 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
--- 5,9 ----
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
! CFG=zlib - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
***************
*** 14,23 ****
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
! !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 x86 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "zlib - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "zlib - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
--- 14,23 ----
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
! !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
***************
*** 30,34 ****
  RSC=rc.exe
  
! !IF  "$(CFG)" == "zlib - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  RSC=rc.exe
  
! !IF  "$(CFG)" == "zlib - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 58,62 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "zlib - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 58,62 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "zlib - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 90,95 ****
  # Begin Target
  
! # Name "zlib - Win32 x86 Release"
! # Name "zlib - Win32 x86 Debug"
  # Begin Source File
  
--- 90,95 ----
  # Begin Target
  
! # Name "zlib - Win32 Release"
! # Name "zlib - Win32 Debug"
  # Begin Source File
  



From fdrake@weyr.cnri.reston.va.us  Thu Feb  3 18:23:38 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 3 Feb 2000 13:23:38 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.7,1.56.2.8
Message-ID: <200002031823.NAA03107@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p1/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

PySequence_In() is replaced by PySequence_Contains().


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.7
retrieving revision 1.56.2.8
diff -C2 -r1.56.2.7 -r1.56.2.8
*** api.tex	2000/01/17 14:30:04	1.56.2.7
--- api.tex	2000/02/03 18:23:34	1.56.2.8
***************
*** 1552,1556 ****
  \end{cfuncdesc}
  
! \begin{cfuncdesc}{int}{PySequence_In}{PyObject *o, PyObject *value}
  Determine if \var{o} contains \var{value}.  If an item in \var{o} is
  equal to \var{value}, return \code{1}, otherwise return \code{0}.  On
--- 1552,1556 ----
  \end{cfuncdesc}
  
! \begin{cfuncdesc}{int}{PySequence_Contains}{PyObject *o, PyObject *value}
  Determine if \var{o} contains \var{value}.  If an item in \var{o} is
  equal to \var{value}, return \code{1}, otherwise return \code{0}.  On



From guido@cnri.reston.va.us  Fri Feb  4 15:10:40 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 4 Feb 2000 10:10:40 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib dospath.py,1.10,1.11 filecmp.py,1.2,1.3 fpformat.py,1.6,1.7 gopherlib.py,1.5,1.6 gzip.py,1.15,1.16 htmlentitydefs.py,1.4,1.5 imghdr.py,1.8,1.9 keyword.py,1.7,1.8 linecache.py,1.4,1.5 macpath.py,1.20,1.21 mailcap.py,1.4,1.5 mhlib.py,1.18,1.19 mimetools.py,1.15,1.16 mimify.py,1.13,1.14 multifile.py,1.8,1.9 mutex.py,1.5,1.6 netrc.py,1.3,1.4 nntplib.py,1.16,1.17 nturl2path.py,1.4,1.5 os.py,1.28,1.29 pdb.py,1.40,1.41 pickle.py,1.35,1.36 pipes.py,1.4,1.5 popen2.py,1.8,1.9 posixfile.py,1.12,1.13 posixpath.py,1.26,1.27 profile.py,1.21,1.22 pstats.py,1.6,1.7 pty.py,1.2,1.3 py_compile.py,1.14,1.15
Message-ID: <200002041510.KAA09691@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	dospath.py filecmp.py fpformat.py gopherlib.py gzip.py 
	htmlentitydefs.py imghdr.py keyword.py linecache.py macpath.py 
	mailcap.py mhlib.py mimetools.py mimify.py multifile.py 
	mutex.py netrc.py nntplib.py nturl2path.py os.py pdb.py 
	pickle.py pipes.py popen2.py posixfile.py posixpath.py 
	profile.py pstats.py pty.py py_compile.py 
Log Message:
More trivial comment -> docstring transformations by Ka-Ping Yee,
who writes:

Here is batch 2, as a big collection of CVS context diffs.
Along with moving comments into docstrings, i've added a
couple of missing docstrings and attempted to make sure more
module docstrings begin with a one-line summary.

I did not add docstrings to the methods in profile.py for
fear of upsetting any careful optimizations there, though
i did move class documentation into class docstrings.

The convention i'm using is to leave credits/version/copyright
type of stuff in # comments, and move the rest of the descriptive
stuff about module usage into module docstrings.  Hope this is
okay.



Index: dospath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/dospath.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** dospath.py	1999/03/19 21:05:12	1.10
--- dospath.py	2000/02/04 15:10:32	1.11
***************
*** 1,3 ****
! # Module 'dospath' -- common operations on DOS pathnames
  
  import os
--- 1,3 ----
! """Module 'dospath' -- common operations on DOS pathnames"""
  
  import os
***************
*** 6,63 ****
  
  
- # Normalize the case of a pathname.
- # On MS-DOS it maps the pathname to lowercase, turns slashes into
- # backslashes.
- # Other normalizations (such as optimizing '../' away) are not allowed
- # (this is done by normpath).
- # Previously, this version mapped invalid consecutive characters to a 
- # single '_', but this has been removed.  This functionality should 
- # possibly be added as a new function.
- 
  def normcase(s):
! 	return string.lower(string.replace(s, "/", "\\"))
  
  
- # Return wheter a path is absolute.
- # Trivial in Posix, harder on the Mac or MS-DOS.
- # For DOS it is absolute if it starts with a slash or backslash (current
- # volume), or if a pathname after the volume letter and colon starts with
- # a slash or backslash.
  
  def isabs(s):
! 	s = splitdrive(s)[1]
! 	return s != '' and s[:1] in '/\\'
  
  
- # Join two (or more) paths.
  
  def join(a, *p):
! 	path = a
! 	for b in p:
! 		if isabs(b):
! 			path = b
! 		elif path == '' or path[-1:] in '/\\':
! 			path = path + b
! 		else:
! 			path = path + os.sep + b
! 	return path
  
  
- # Split a path in a drive specification (a drive letter followed by a
- # colon) and the path specification.
- # It is always true that drivespec + pathspec == p
  
  def splitdrive(p):
! 	if p[1:2] == ':':
! 		return p[0:2], p[2:]
! 	return '', p
! 
  
- # Split a path in head (everything up to the last '/') and tail (the
- # rest).  After the trailing '/' is stripped, the invariant
- # join(head, tail) == p holds.
- # The resulting head won't end in '/' unless it is the root.
  
  def split(p):
      d, p = splitdrive(p)
      # set i to index beyond p's last slash
--- 6,63 ----
  
  
  def normcase(s):
!     """Normalize the case of a pathname.
!     On MS-DOS it maps the pathname to lowercase, turns slashes into
!     backslashes.
!     Other normalizations (such as optimizing '../' away) are not allowed
!     (this is done by normpath).
!     Previously, this version mapped invalid consecutive characters to a 
!     single '_', but this has been removed.  This functionality should 
!     possibly be added as a new function."""
  
+     return string.lower(string.replace(s, "/", "\\"))
  
  
  def isabs(s):
!     """Return whether a path is absolute.
!     Trivial in Posix, harder on the Mac or MS-DOS.
!     For DOS it is absolute if it starts with a slash or backslash (current
!     volume), or if a pathname after the volume letter and colon starts with
!     a slash or backslash."""
  
+     s = splitdrive(s)[1]
+     return s != '' and s[:1] in '/\\'
  
  
  def join(a, *p):
!     """Join two (or more) paths."""
  
+     path = a
+     for b in p:
+         if isabs(b):
+             path = b
+         elif path == '' or path[-1:] in '/\\':
+             path = path + b
+         else:
+             path = path + os.sep + b
+     return path
  
  
  def splitdrive(p):
!     """Split a path into a drive specification (a drive letter followed
!     by a colon) and path specification.
!     It is always true that drivespec + pathspec == p."""
! 
!     if p[1:2] == ':':
!         return p[0:2], p[2:]
!     return '', p
  
  
  def split(p):
+     """Split a path into head (everything up to the last '/') and tail
+     (the rest).  After the trailing '/' is stripped, the invariant
+     join(head, tail) == p holds.
+     The resulting head won't end in '/' unless it is the root."""
+ 
      d, p = splitdrive(p)
      # set i to index beyond p's last slash
***************
*** 74,118 ****
  
  
- # Split a path in root and extension.
- # The extension is everything starting at the first dot in the last
- # pathname component; the root is everything before that.
- # It is always true that root + ext == p.
- 
  def splitext(p):
! 	root, ext = '', ''
! 	for c in p:
! 		if c in '/\\':
! 			root, ext = root + ext + c, ''
! 		elif c == '.' or ext:
! 			ext = ext + c
! 		else:
! 			root = root + c
! 	return root, ext
! 
  
- # Return the tail (basename) part of a path.
  
  def basename(p):
! 	return split(p)[1]
  
  
- # Return the head (dirname) part of a path.
  
  def dirname(p):
! 	return split(p)[0]
  
  
- # Return the longest prefix of all list elements.
  
  def commonprefix(m):
! 	if not m: return ''
! 	prefix = m[0]
! 	for item in m:
! 		for i in range(len(prefix)):
! 			if prefix[:i+1] <> item[:i+1]:
! 				prefix = prefix[:i]
! 				if i == 0: return ''
! 				break
! 	return prefix
  
  
--- 74,118 ----
  
  
  def splitext(p):
!     """Split a path into root and extension.
!     The extension is everything starting at the first dot in the last
!     pathname component; the root is everything before that.
!     It is always true that root + ext == p."""
! 
!     root, ext = '', ''
!     for c in p:
!         if c in '/\\':
!             root, ext = root + ext + c, ''
!         elif c == '.' or ext:
!             ext = ext + c
!         else:
!             root = root + c
!     return root, ext
  
  
  def basename(p):
!     """Return the tail (basename) part of a path."""
  
+     return split(p)[1]
  
  
  def dirname(p):
!     """Return the head (dirname) part of a path."""
  
+     return split(p)[0]
  
  
  def commonprefix(m):
!     """Return the longest prefix of all list elements."""
! 
!     if not m: return ''
!     prefix = m[0]
!     for item in m:
!         for i in range(len(prefix)):
!             if prefix[:i+1] <> item[:i+1]:
!                 prefix = prefix[:i]
!                 if i == 0: return ''
!                 break
!     return prefix
  
  
***************
*** 135,332 ****
  
  
- # Is a path a symbolic link?
- # This will always return false on systems where posix.lstat doesn't exist.
- 
  def islink(path):
! 	return 0
  
  
- # Does a path exist?
- # This is false for dangling symbolic links.
  
  def exists(path):
! 	try:
! 		st = os.stat(path)
! 	except os.error:
! 		return 0
! 	return 1
  
  
- # Is a path a dos directory?
- # This follows symbolic links, so both islink() and isdir() can be true
- # for the same path.
  
  def isdir(path):
! 	try:
! 		st = os.stat(path)
! 	except os.error:
! 		return 0
! 	return stat.S_ISDIR(st[stat.ST_MODE])
  
  
- # Is a path a regular file?
- # This follows symbolic links, so both islink() and isdir() can be true
- # for the same path.
  
  def isfile(path):
! 	try:
! 		st = os.stat(path)
! 	except os.error:
! 		return 0
! 	return stat.S_ISREG(st[stat.ST_MODE])
  
  
- # Is a path a mount point?
- # XXX This degenerates in: 'is this the root?' on DOS
  
  def ismount(path):
! 	return isabs(splitdrive(path)[1])
  
  
- # Directory tree walk.
- # For each directory under top (including top itself, but excluding
- # '.' and '..'), func(arg, dirname, filenames) is called, where
- # dirname is the name of the directory and filenames is the list
- # files files (and subdirectories etc.) in the directory.
- # The func may modify the filenames list, to implement a filter,
- # or to impose a different order of visiting.
  
  def walk(top, func, arg):
! 	try:
! 		names = os.listdir(top)
! 	except os.error:
! 		return
! 	func(arg, top, names)
! 	exceptions = ('.', '..')
! 	for name in names:
! 		if name not in exceptions:
! 			name = join(top, name)
! 			if isdir(name):
! 				walk(name, func, arg)
! 
! 
! # Expand paths beginning with '~' or '~user'.
! # '~' means $HOME; '~user' means that user's home directory.
! # If the path doesn't begin with '~', or if the user or $HOME is unknown,
! # the path is returned unchanged (leaving error reporting to whatever
! # function is called with the expanded path as argument).
! # See also module 'glob' for expansion of *, ? and [...] in pathnames.
! # (A function should also be defined to do full *sh-style environment
! # variable expansion.)
  
  def expanduser(path):
! 	if path[:1] <> '~':
! 		return path
! 	i, n = 1, len(path)
! 	while i < n and path[i] not in '/\\':
! 		i = i+1
! 	if i == 1:
! 		if not os.environ.has_key('HOME'):
! 			return path
! 		userhome = os.environ['HOME']
! 	else:
! 		return path
! 	return userhome + path[i:]
! 
! 
! # Expand paths containing shell variable substitutions.
! # The following rules apply:
! #	- no expansion within single quotes
! #	- no escape character, except for '$$' which is translated into '$'
! #	- ${varname} is accepted.
! #	- varnames can be made out of letters, digits and the character '_'
! # XXX With COMMAND.COM you can use any characters in a variable name,
! # XXX except '^|<>='.
  
  varchars = string.letters + string.digits + '_-'
  
  def expandvars(path):
! 	if '$' not in path:
! 		return path
! 	res = ''
! 	index = 0
! 	pathlen = len(path)
! 	while index < pathlen:
! 		c = path[index]
! 		if c == '\'':	# no expansion within single quotes
! 			path = path[index + 1:]
! 			pathlen = len(path)
! 			try:
! 				index = string.index(path, '\'')
! 				res = res + '\'' + path[:index + 1]
! 			except string.index_error:
! 				res = res + path
! 				index = pathlen -1
! 		elif c == '$':	# variable or '$$'
! 			if path[index + 1:index + 2] == '$':
! 				res = res + c
! 				index = index + 1
! 			elif path[index + 1:index + 2] == '{':
! 				path = path[index+2:]
! 				pathlen = len(path)
! 				try:
! 					index = string.index(path, '}')
! 					var = path[:index]
! 					if os.environ.has_key(var):
! 						res = res + os.environ[var]
! 				except string.index_error:
! 					res = res + path
! 					index = pathlen - 1
! 			else:
! 				var = ''
! 				index = index + 1
! 				c = path[index:index + 1]
! 				while c != '' and c in varchars:
! 					var = var + c
! 					index = index + 1
! 					c = path[index:index + 1]
! 				if os.environ.has_key(var):
! 					res = res + os.environ[var]
! 				if c != '':
! 					res = res + c
! 		else:
! 			res = res + c
! 		index = index + 1
! 	return res
  
  
- # Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A/B.
- # Also, components of the path are silently truncated to 8+3 notation.
- 
  def normpath(path):
! 	path = string.replace(path, "/", "\\")
! 	prefix, path = splitdrive(path)
! 	while path[:1] == os.sep:
! 		prefix = prefix + os.sep
! 		path = path[1:]
! 	comps = string.splitfields(path, os.sep)
! 	i = 0
! 	while i < len(comps):
! 		if comps[i] == '.':
! 			del comps[i]
! 		elif comps[i] == '..' and i > 0 and \
! 					  comps[i-1] not in ('', '..'):
! 			del comps[i-1:i+1]
! 			i = i-1
! 		elif comps[i] == '' and i > 0 and comps[i-1] <> '':
! 			del comps[i]
! 		elif '.' in comps[i]:
! 			comp = string.splitfields(comps[i], '.')
! 			comps[i] = comp[0][:8] + '.' + comp[1][:3]
! 			i = i+1
! 		elif len(comps[i]) > 8:
! 			comps[i] = comps[i][:8]
! 			i = i+1
! 		else:
! 			i = i+1
! 	# If the path is now empty, substitute '.'
! 	if not prefix and not comps:
! 		comps.append('.')
! 	return prefix + string.joinfields(comps, os.sep)
  
  
  
- # Return an absolute path.
  def abspath(path):
      if not isabs(path):
          path = join(os.getcwd(), path)
--- 135,328 ----
  
  
  def islink(path):
!     """Is a path a symbolic link?
!     This will always return false on systems where posix.lstat doesn't exist."""
  
+     return 0
  
  
  def exists(path):
!     """Does a path exist?
!     This is false for dangling symbolic links."""
  
+     try:
+         st = os.stat(path)
+     except os.error:
+         return 0
+     return 1
  
  
  def isdir(path):
!     """Is a path a dos directory?"""
  
+     try:
+         st = os.stat(path)
+     except os.error:
+         return 0
+     return stat.S_ISDIR(st[stat.ST_MODE])
  
  
  def isfile(path):
!     """Is a path a regular file?"""
  
+     try:
+         st = os.stat(path)
+     except os.error:
+         return 0
+     return stat.S_ISREG(st[stat.ST_MODE])
  
  
  def ismount(path):
!     """Is a path a mount point?"""
!     # XXX This degenerates in: 'is this the root?' on DOS
  
+     return isabs(splitdrive(path)[1])
  
  
  def walk(top, func, arg):
!     """Directory tree walk.
!     For each directory under top (including top itself, but excluding
!     '.' and '..'), func(arg, dirname, filenames) is called, where
!     dirname is the name of the directory and filenames is the list
!     files files (and subdirectories etc.) in the directory.
!     The func may modify the filenames list, to implement a filter,
!     or to impose a different order of visiting."""
! 
!     try:
!         names = os.listdir(top)
!     except os.error:
!         return
!     func(arg, top, names)
!     exceptions = ('.', '..')
!     for name in names:
!         if name not in exceptions:
!             name = join(top, name)
!             if isdir(name):
!                 walk(name, func, arg)
! 
  
  def expanduser(path):
!     """Expand paths beginning with '~' or '~user'.
!     '~' means $HOME; '~user' means that user's home directory.
!     If the path doesn't begin with '~', or if the user or $HOME is unknown,
!     the path is returned unchanged (leaving error reporting to whatever
!     function is called with the expanded path as argument).
!     See also module 'glob' for expansion of *, ? and [...] in pathnames.
!     (A function should also be defined to do full *sh-style environment
!     variable expansion.)"""
! 
!     if path[:1] <> '~':
!         return path
!     i, n = 1, len(path)
!     while i < n and path[i] not in '/\\':
!         i = i+1
!     if i == 1:
!         if not os.environ.has_key('HOME'):
!             return path
!         userhome = os.environ['HOME']
!     else:
!         return path
!     return userhome + path[i:]
! 
  
  varchars = string.letters + string.digits + '_-'
  
  def expandvars(path):
!     """Expand paths containing shell variable substitutions.
!     The following rules apply:
!         - no expansion within single quotes
!         - no escape character, except for '$$' which is translated into '$'
!         - ${varname} is accepted.
!         - varnames can be made out of letters, digits and the character '_'"""
!     # XXX With COMMAND.COM you can use any characters in a variable name,
!     # XXX except '^|<>='.
! 
!     if '$' not in path:
!         return path
!     res = ''
!     index = 0
!     pathlen = len(path)
!     while index < pathlen:
!         c = path[index]
!         if c == '\'':   # no expansion within single quotes
!             path = path[index + 1:]
!             pathlen = len(path)
!             try:
!                 index = string.index(path, '\'')
!                 res = res + '\'' + path[:index + 1]
!             except string.index_error:
!                 res = res + path
!                 index = pathlen -1
!         elif c == '$':  # variable or '$$'
!             if path[index + 1:index + 2] == '$':
!                 res = res + c
!                 index = index + 1
!             elif path[index + 1:index + 2] == '{':
!                 path = path[index+2:]
!                 pathlen = len(path)
!                 try:
!                     index = string.index(path, '}')
!                     var = path[:index]
!                     if os.environ.has_key(var):
!                         res = res + os.environ[var]
!                 except string.index_error:
!                     res = res + path
!                     index = pathlen - 1
!             else:
!                 var = ''
!                 index = index + 1
!                 c = path[index:index + 1]
!                 while c != '' and c in varchars:
!                     var = var + c
!                     index = index + 1
!                     c = path[index:index + 1]
!                 if os.environ.has_key(var):
!                     res = res + os.environ[var]
!                 if c != '':
!                     res = res + c
!         else:
!             res = res + c
!         index = index + 1
!     return res
  
  
  def normpath(path):
!     """Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A/B.
!     Also, components of the path are silently truncated to 8+3 notation."""
! 
!     path = string.replace(path, "/", "\\")
!     prefix, path = splitdrive(path)
!     while path[:1] == os.sep:
!         prefix = prefix + os.sep
!         path = path[1:]
!     comps = string.splitfields(path, os.sep)
!     i = 0
!     while i < len(comps):
!         if comps[i] == '.':
!             del comps[i]
!         elif comps[i] == '..' and i > 0 and \
!                       comps[i-1] not in ('', '..'):
!             del comps[i-1:i+1]
!             i = i-1
!         elif comps[i] == '' and i > 0 and comps[i-1] <> '':
!             del comps[i]
!         elif '.' in comps[i]:
!             comp = string.splitfields(comps[i], '.')
!             comps[i] = comp[0][:8] + '.' + comp[1][:3]
!             i = i+1
!         elif len(comps[i]) > 8:
!             comps[i] = comps[i][:8]
!             i = i+1
!         else:
!             i = i+1
!     # If the path is now empty, substitute '.'
!     if not prefix and not comps:
!         comps.append('.')
!     return prefix + string.joinfields(comps, os.sep)
  
  
  
  def abspath(path):
+     """Return an absolute path."""
      if not isabs(path):
          path = join(os.getcwd(), path)

Index: filecmp.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/filecmp.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** filecmp.py	2000/02/03 00:41:22	1.2
--- filecmp.py	2000/02/04 15:10:32	1.3
***************
*** 1,318 ****
! """Utilities for comparing files and directories.
  
! Classes:
!     dircmp
  
- Functions:
-     cmp(f1, f2, shallow=1, use_statcache=0) -> int
-     cmpfiles(a, b, common) -> ([], [], [])
- 
- """
- 
- import os
- import stat
- import statcache
- 
  _cache = {}
  BUFSIZE=8*1024
  
! def cmp(f1, f2, shallow=1,use_statcache=0):
!     """Compare two files.
  
!     Arguments:
  
!     f1 -- First file name
  
!     f2 -- Second file name
  
!     shallow -- Just check stat signature (do not read the files).
!                defaults to 1.
  
!     use_statcache -- Do not stat() each file directly: go through
!                      the statcache module for more efficiency.
  
!     Return value:
  
!     integer -- 1 if the files are the same, 0 otherwise.
  
!     This function uses a cache for past comparisons and the results,
!     with a cache invalidation mechanism relying on stale signatures.
!     Of course, if 'use_statcache' is true, this mechanism is defeated,
!     and the cache will never grow stale.
  
!     """
!     stat_function = (os.stat, statcache.stat)[use_statcache]
!     s1, s2 = _sig(stat_function(f1)), _sig(stat_function(f2))
!     if s1[0]!=stat.S_IFREG or s2[0]!=stat.S_IFREG: return 0
!     if shallow and s1 == s2: return 1
!     if s1[1]!=s2[1]:         return 0
  
!     result = _cache.get((f1, f2))
!     if result and (s1, s2)==result[:2]:
!         return result[2]
!     outcome = _do_cmp(f1, f2)
!     _cache[f1, f2] = s1, s2, outcome
!     return outcome
  
  def _sig(st):
!     return (stat.S_IFMT(st[stat.ST_MODE]),
!             st[stat.ST_SIZE],
!             st[stat.ST_MTIME])
  
  def _do_cmp(f1, f2):
!     bufsize = BUFSIZE
!     fp1 , fp2 = open(f1, 'rb'), open(f2, 'rb')
!     while 1:
!         b1, b2 = fp1.read(bufsize), fp2.read(bufsize)
!         if b1!=b2: return 0
!         if not b1: return 1
! 
! # Directory comparison class.
! #
! class dircmp:
!     """A class that manages the comparison of 2 directories.
! 
!     dircmp(a,b,ignore=None,hide=None)
!       A and B are directories.
!       IGNORE is a list of names to ignore,
!         defaults to ['RCS', 'CVS', 'tags'].
!       HIDE is a list of names to hide,
!         defaults to [os.curdir, os.pardir].
! 
!     High level usage:
!       x = dircmp(dir1, dir2)
!       x.report() -> prints a report on the differences between dir1 and dir2
!        or
!       x.report_partial_closure() -> prints report on differences between dir1
!             and dir2, and reports on common immediate subdirectories.
!       x.report_full_closure() -> like report_partial_closure,
!             but fully recursive.
! 
!     Attributes:
!      left_list, right_list: The files in dir1 and dir2,
!         filtered by hide and ignore.
!      common: a list of names in both dir1 and dir2.
!      left_only, right_only: names only in dir1, dir2.
!      common_dirs: subdirectories in both dir1 and dir2.
!      common_files: files in both dir1 and dir2.
!      common_funny: names in both dir1 and dir2 where the type differs between
!         dir1 and dir2, or the name is not stat-able.
!      same_files: list of identical files.
!      diff_files: list of filenames which differ.
!      funny_files: list of files which could not be compared.
!      subdirs: a dictionary of dircmp objects, keyed by names in common_dirs.
!      """
! 
!     def __init__(self, a, b, ignore=None, hide=None): # Initialize
!         self.left = a
!         self.right = b
!         if hide is None:
!             self.hide = [os.curdir, os.pardir] # Names never to be shown
!         else:
!             self.hide = hide
!         if ignore is None:
!             self.ignore = ['RCS', 'CVS', 'tags'] # Names ignored in comparison
!         else:
!             self.ignore = ignore
! 
!     def phase0(self): # Compare everything except common subdirectories
!         self.left_list = _filter(os.listdir(self.left),
!                                  self.hide+self.ignore)
!         self.right_list = _filter(os.listdir(self.right),
!                                   self.hide+self.ignore)
!         self.left_list.sort()
!         self.right_list.sort()
! 
!     __p4_attrs = ('subdirs',)
!     __p3_attrs = ('same_files', 'diff_files', 'funny_files')
!     __p2_attrs = ('common_dirs', 'common_files', 'common_funny')
!     __p1_attrs = ('common', 'left_only', 'right_only')
!     __p0_attrs = ('left_list', 'right_list')
! 
!     def __getattr__(self, attr):
!         if attr in self.__p4_attrs:
!             self.phase4()
!         elif attr in self.__p3_attrs:
!             self.phase3()
!         elif attr in self.__p2_attrs:
!             self.phase2()
!         elif attr in self.__p1_attrs:
!             self.phase1()
!         elif attr in self.__p0_attrs:
!             self.phase0()
!         else:
!             raise AttributeError, attr
!         return getattr(self, attr)
! 
!     def phase1(self): # Compute common names
!         a_only, b_only = [], []
!         common = {}
!         b = {}
!         for fnm in self.right_list:
!             b[fnm] = 1
!         for x in self.left_list:
!             if b.get(x, 0):
!                 common[x] = 1
!             else:
!                 a_only.append(x)
!         for x in self.right_list:
!             if common.get(x, 0):
!                 pass
!             else:
!                 b_only.append(x)
!         self.common = common.keys()
!         self.left_only = a_only
!         self.right_only = b_only
! 
!     def phase2(self): # Distinguish files, directories, funnies
!         self.common_dirs = []
!         self.common_files = []
!         self.common_funny = []
! 
!         for x in self.common:
!             a_path = os.path.join(self.left, x)
!             b_path = os.path.join(self.right, x)
! 
!             ok = 1
!             try:
!                 a_stat = statcache.stat(a_path)
!             except os.error, why:
!                 # print 'Can\'t stat', a_path, ':', why[1]
!                 ok = 0
!             try:
!                 b_stat = statcache.stat(b_path)
!             except os.error, why:
!                 # print 'Can\'t stat', b_path, ':', why[1]
!                 ok = 0
! 
!             if ok:
!                 a_type = stat.S_IFMT(a_stat[stat.ST_MODE])
!                 b_type = stat.S_IFMT(b_stat[stat.ST_MODE])
!                 if a_type <> b_type:
!                     self.common_funny.append(x)
!                 elif stat.S_ISDIR(a_type):
!                     self.common_dirs.append(x)
!                 elif stat.S_ISREG(a_type):
!                     self.common_files.append(x)
!                 else:
!                     self.common_funny.append(x)
!             else:
!                 self.common_funny.append(x)
! 
!     def phase3(self): # Find out differences between common files
!         xx = cmpfiles(self.left, self.right, self.common_files)
!         self.same_files, self.diff_files, self.funny_files = xx
! 
!     def phase4(self): # Find out differences between common subdirectories
!         # A new dircmp object is created for each common subdirectory,
!         # these are stored in a dictionary indexed by filename.
!         # The hide and ignore properties are inherited from the parent
!         self.subdirs = {}
!         for x in self.common_dirs:
!             a_x = os.path.join(self.left, x)
!             b_x = os.path.join(self.right, x)
!             self.subdirs[x]  = dircmp(a_x, b_x, self.ignore, self.hide)
! 
!     def phase4_closure(self): # Recursively call phase4() on subdirectories
!         self.phase4()
!         for x in self.subdirs.keys():
!             self.subdirs[x].phase4_closure()
! 
!     def report(self): # Print a report on the differences between a and b
!         # Output format is purposely lousy
!         print 'diff', self.left, self.right
!         if self.left_only:
!             self.left_only.sort()
!             print 'Only in', self.left, ':', self.left_only
!         if self.right_only:
!             self.right_only.sort()
!             print 'Only in', self.right, ':', self.right_only
!         if self.same_files:
!             self.same_files.sort()
!             print 'Identical files :', self.same_files
!         if self.diff_files:
!             self.diff_files.sort()
!             print 'Differing files :', self.diff_files
!         if self.funny_files:
!             self.funny_files.sort()
!             print 'Trouble with common files :', self.funny_files
!         if self.common_dirs:
!             self.common_dirs.sort()
!             print 'Common subdirectories :', self.common_dirs
!         if self.common_funny:
!             self.common_funny.sort()
!             print 'Common funny cases :', self.common_funny
! 
!     def report_partial_closure(self): # Print reports on self and on subdirs
!         self.report()
!         for x in self.subdirs.keys():
!             print
!             self.subdirs[x].report()
! 
!     def report_full_closure(self): # Report on self and subdirs recursively
!         self.report()
!         for x in self.subdirs.keys():
!             print
!             self.subdirs[x].report_full_closure()
! 
! 
! # Compare common files in two directories.
! # Return:
! #	- files that compare equal
! #	- files that compare different
! #	- funny cases (can't stat etc.)
! #
! def cmpfiles(a, b, common):
!     """Compare common files in two directories.
! 
!     cmpfiles(a,b,common)
!       A and B are directory names
!       COMMON is a list of file names
!     returns a tuple of three lists:
!       files that compare equal
!       files that are different
!       filenames that aren't regular files."""
! 
!     res = ([], [], [])
!     for x in common:
!         res[_cmp(os.path.join(a, x), os.path.join(b, x))].append(x)
!     return res
! 
! 
! # Compare two files.
! # Return:
! #	0 for equal
! #	1 for different
! #	2 for funny cases (can't stat, etc.)
! #
! def _cmp(a, b):
!     try:
!         return not abs(cmp(a, b))
!     except os.error:
!         return 2
! 
! 
! # Return a copy with items that occur in skip removed.
! #
! def _filter(list, skip):
!     result = []
!     for item in list:
!         if item not in skip: result.append(item)
!     return result
! 
! 
! # Demonstration and testing.
! #
! def demo():
!     import sys
!     import getopt
!     options, args = getopt.getopt(sys.argv[1:], 'r')
!     if len(args) <> 2: raise getopt.error, 'need exactly two args'
!     dd = dircmp(args[0], args[1])
!     if ('-r', '') in options:
!         dd.report_full_closure()
!     else:
!         dd.report()
! 
! if __name__ == '__main__':
!     demo()
--- 1,57 ----
! """Compare files."""
  
! import os, stat, statcache
  
  _cache = {}
  BUFSIZE=8*1024
  
! def cmp(f1, f2, shallow=1,use_statcache=0): 
! 	"""Compare two files.
  
! 	Arguments:
  
! 	f1 -- First file name
  
! 	f2 -- Second file name
  
! 	shallow -- Just check stat signature (do not read the files).
! 	           defaults to 1.
  
! 	use_statcache -- Do not stat() each file directly: go through
! 	                 the statcache module for more efficiency.
  
! 	Return value:
  
! 	integer -- 1 if the files are the same, 0 otherwise.
  
! 	This function uses a cache for past comparisons and the results,
! 	with a cache invalidation mechanism relying on stale signatures.
! 	Of course, if 'use_statcache' is true, this mechanism is defeated,
! 	and the cache will never grow stale.
  
! 	"""
! 	stat_function = (os.stat, statcache.stat)[use_statcache]
! 	s1, s2 = _sig(stat_function(f1)), _sig(stat_function(f2))
! 	if s1[0]!=stat.S_IFREG or s2[0]!=stat.S_IFREG: return 0
! 	if shallow and s1 == s2: return 1
! 	if s1[1]!=s2[1]:         return 0
  
! 	result = _cache.get((f1, f2))
! 	if result and (s1, s2)==result[:2]:
! 		return result[2]
! 	outcome = _do_cmp(f1, f2)
! 	_cache[f1, f2] = s1, s2, outcome
! 	return outcome
  
  def _sig(st):
! 	return (stat.S_IFMT(st[stat.ST_MODE]), 
! 	        st[stat.ST_SIZE], 
! 	        st[stat.ST_MTIME])
  
  def _do_cmp(f1, f2):
! 	bufsize = BUFSIZE
! 	fp1 , fp2 = open(f1, 'rb'), open(f2, 'rb')
! 	while 1:
! 		b1, b2 = fp1.read(bufsize), fp2.read(bufsize)
! 		if b1!=b2: return 0
! 		if not b1: return 1

Index: fpformat.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/fpformat.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** fpformat.py	2000/02/02 15:10:13	1.6
--- fpformat.py	2000/02/04 15:10:32	1.7
***************
*** 23,141 ****
  
  try:
! 	class NotANumber(ValueError):
! 		pass
  except TypeError:
! 	NotANumber = 'fpformat.NotANumber'
  
- # Return (sign, intpart, fraction, expo) or raise an exception:
- # sign is '+' or '-'
- # intpart is 0 or more digits beginning with a nonzero
- # fraction is 0 or more digits
- # expo is an integer
  def extract(s):
! 	res = decoder.match(s)
! 	if res is None: raise NotANumber, s
! 	sign, intpart, fraction, exppart = res.group(1,2,3,4)
! 	if sign == '+': sign = ''
! 	if fraction: fraction = fraction[1:]
! 	if exppart: expo = int(exppart[1:])
! 	else: expo = 0
! 	return sign, intpart, fraction, expo
  
- # Remove the exponent by changing intpart and fraction
  def unexpo(intpart, fraction, expo):
! 	if expo > 0: # Move the point left
! 		f = len(fraction)
! 		intpart, fraction = intpart + fraction[:expo], fraction[expo:]
! 		if expo > f:
! 			intpart = intpart + '0'*(expo-f)
! 	elif expo < 0: # Move the point right
! 		i = len(intpart)
! 		intpart, fraction = intpart[:expo], intpart[expo:] + fraction
! 		if expo < -i:
! 			fraction = '0'*(-expo-i) + fraction
! 	return intpart, fraction
  
- # Round or extend the fraction to size digs
  def roundfrac(intpart, fraction, digs):
! 	f = len(fraction)
! 	if f <= digs:
! 		return intpart, fraction + '0'*(digs-f)
! 	i = len(intpart)
! 	if i+digs < 0:
! 		return '0'*-digs, ''
! 	total = intpart + fraction
! 	nextdigit = total[i+digs]
! 	if nextdigit >= '5': # Hard case: increment last digit, may have carry!
! 		n = i + digs - 1
! 		while n >= 0:
! 			if total[n] != '9': break
! 			n = n-1
! 		else:
! 			total = '0' + total
! 			i = i+1
! 			n = 0
! 		total = total[:n] + chr(ord(total[n]) + 1) + '0'*(len(total)-n-1)
! 		intpart, fraction = total[:i], total[i:]
! 	if digs >= 0:
! 		return intpart, fraction[:digs]
! 	else:
! 		return intpart[:digs] + '0'*-digs, ''
! 
! # Format x as [-]ddd.ddd with 'digs' digits after the point
! # and at least one digit before.
! # If digs <= 0, the point is suppressed.
  def fix(x, digs):
! 	if type(x) != type(''): x = `x`
! 	try:
! 		sign, intpart, fraction, expo = extract(x)
! 	except NotANumber:
! 		return x
! 	intpart, fraction = unexpo(intpart, fraction, expo)
! 	intpart, fraction = roundfrac(intpart, fraction, digs)
! 	while intpart and intpart[0] == '0': intpart = intpart[1:]
! 	if intpart == '': intpart = '0'
! 	if digs > 0: return sign + intpart + '.' + fraction
! 	else: return sign + intpart
! 
! # Format x as [-]d.dddE[+-]ddd with 'digs' digits after the point
! # and exactly one digit before.
! # If digs is <= 0, one digit is kept and the point is suppressed.
  def sci(x, digs):
! 	if type(x) != type(''): x = `x`
! 	sign, intpart, fraction, expo = extract(x)
! 	if not intpart:
! 		while fraction and fraction[0] == '0':
! 			fraction = fraction[1:]
! 			expo = expo - 1
! 		if fraction:
! 			intpart, fraction = fraction[0], fraction[1:]
! 			expo = expo - 1
! 		else:
! 			intpart = '0'
! 	else:
! 		expo = expo + len(intpart) - 1
! 		intpart, fraction = intpart[0], intpart[1:] + fraction
! 	digs = max(0, digs)
! 	intpart, fraction = roundfrac(intpart, fraction, digs)
! 	if len(intpart) > 1:
! 		intpart, fraction, expo = \
! 			intpart[0], intpart[1:] + fraction[:-1], \
! 			expo + len(intpart) - 1
! 	s = sign + intpart
! 	if digs > 0: s = s + '.' + fraction
! 	e = `abs(expo)`
! 	e = '0'*(3-len(e)) + e
! 	if expo < 0: e = '-' + e
! 	else: e = '+' + e
! 	return s + 'e' + e
  
- # Interactive test run
  def test():
! 	try:
! 		while 1:
! 			x, digs = input('Enter (x, digs): ')
! 			print x, fix(x, digs), sci(x, digs)
! 	except (EOFError, KeyboardInterrupt):
! 		pass
  
--- 23,141 ----
  
  try:
!     class NotANumber(ValueError):
!         pass
  except TypeError:
!     NotANumber = 'fpformat.NotANumber'
  
  def extract(s):
!     """Return (sign, intpart, fraction, expo) or raise an exception:
!     sign is '+' or '-'
!     intpart is 0 or more digits beginning with a nonzero
!     fraction is 0 or more digits
!     expo is an integer"""
!     res = decoder.match(s)
!     if res is None: raise NotANumber, s
!     sign, intpart, fraction, exppart = res.group(1,2,3,4)
!     if sign == '+': sign = ''
!     if fraction: fraction = fraction[1:]
!     if exppart: expo = int(exppart[1:])
!     else: expo = 0
!     return sign, intpart, fraction, expo
  
  def unexpo(intpart, fraction, expo):
!     """Remove the exponent by changing intpart and fraction."""
!     if expo > 0: # Move the point left
!         f = len(fraction)
!         intpart, fraction = intpart + fraction[:expo], fraction[expo:]
!         if expo > f:
!             intpart = intpart + '0'*(expo-f)
!     elif expo < 0: # Move the point right
!         i = len(intpart)
!         intpart, fraction = intpart[:expo], intpart[expo:] + fraction
!         if expo < -i:
!             fraction = '0'*(-expo-i) + fraction
!     return intpart, fraction
  
  def roundfrac(intpart, fraction, digs):
!     """Round or extend the fraction to size digs."""
!     f = len(fraction)
!     if f <= digs:
!         return intpart, fraction + '0'*(digs-f)
!     i = len(intpart)
!     if i+digs < 0:
!         return '0'*-digs, ''
!     total = intpart + fraction
!     nextdigit = total[i+digs]
!     if nextdigit >= '5': # Hard case: increment last digit, may have carry!
!         n = i + digs - 1
!         while n >= 0:
!             if total[n] != '9': break
!             n = n-1
!         else:
!             total = '0' + total
!             i = i+1
!             n = 0
!         total = total[:n] + chr(ord(total[n]) + 1) + '0'*(len(total)-n-1)
!         intpart, fraction = total[:i], total[i:]
!     if digs >= 0:
!         return intpart, fraction[:digs]
!     else:
!         return intpart[:digs] + '0'*-digs, ''
! 
  def fix(x, digs):
!     """Format x as [-]ddd.ddd with 'digs' digits after the point
!     and at least one digit before.
!     If digs <= 0, the point is suppressed."""
!     if type(x) != type(''): x = `x`
!     try:
!         sign, intpart, fraction, expo = extract(x)
!     except NotANumber:
!         return x
!     intpart, fraction = unexpo(intpart, fraction, expo)
!     intpart, fraction = roundfrac(intpart, fraction, digs)
!     while intpart and intpart[0] == '0': intpart = intpart[1:]
!     if intpart == '': intpart = '0'
!     if digs > 0: return sign + intpart + '.' + fraction
!     else: return sign + intpart
! 
  def sci(x, digs):
!     """Format x as [-]d.dddE[+-]ddd with 'digs' digits after the point
!     and exactly one digit before.
!     If digs is <= 0, one digit is kept and the point is suppressed."""
!     if type(x) != type(''): x = `x`
!     sign, intpart, fraction, expo = extract(x)
!     if not intpart:
!         while fraction and fraction[0] == '0':
!             fraction = fraction[1:]
!             expo = expo - 1
!         if fraction:
!             intpart, fraction = fraction[0], fraction[1:]
!             expo = expo - 1
!         else:
!             intpart = '0'
!     else:
!         expo = expo + len(intpart) - 1
!         intpart, fraction = intpart[0], intpart[1:] + fraction
!     digs = max(0, digs)
!     intpart, fraction = roundfrac(intpart, fraction, digs)
!     if len(intpart) > 1:
!         intpart, fraction, expo = \
!             intpart[0], intpart[1:] + fraction[:-1], \
!             expo + len(intpart) - 1
!     s = sign + intpart
!     if digs > 0: s = s + '.' + fraction
!     e = `abs(expo)`
!     e = '0'*(3-len(e)) + e
!     if expo < 0: e = '-' + e
!     else: e = '+' + e
!     return s + 'e' + e
  
  def test():
!     """Interactive test run."""
!     try:
!         while 1:
!             x, digs = input('Enter (x, digs): ')
!             print x, fix(x, digs), sci(x, digs)
!     except (EOFError, KeyboardInterrupt):
!         pass
  

Index: gopherlib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/gopherlib.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** gopherlib.py	1998/03/26 20:43:41	1.5
--- gopherlib.py	2000/02/04 15:10:32	1.6
***************
*** 1,3 ****
! # Gopher protocol client interface
  
  import string
--- 1,3 ----
! """Gopher protocol client interface."""
  
  import string
***************
*** 30,35 ****
  A_QUERY      = 'q'
  A_GIF        = 'g'
! A_HTML       = 'h'			# HTML file
! A_WWW        = 'w'			# WWW address
  A_PLUS_IMAGE = ':'
  A_PLUS_MOVIE = ';'
--- 30,35 ----
  A_QUERY      = 'q'
  A_GIF        = 'g'
! A_HTML       = 'h'          # HTML file
! A_WWW        = 'w'          # WWW address
  A_PLUS_IMAGE = ':'
  A_PLUS_MOVIE = ';'
***************
*** 37,52 ****
  
  
- # Function mapping all file types to strings; unknown types become TYPE='x'
  _names = dir()
  _type_to_name_map = {}
  def type_to_name(gtype):
! 	global _type_to_name_map
! 	if _type_to_name_map=={}:
! 		for name in _names:
! 			if name[:2] == 'A_':
! 				_type_to_name_map[eval(name)] = name[2:]
! 	if _type_to_name_map.has_key(gtype):
! 		return _type_to_name_map[gtype]
! 	return 'TYPE=' + `gtype`
  
  # Names for characters and strings
--- 37,52 ----
  
  
  _names = dir()
  _type_to_name_map = {}
  def type_to_name(gtype):
!     """Map all file types to strings; unknown types become TYPE='x'."""
!     global _type_to_name_map
!     if _type_to_name_map=={}:
!         for name in _names:
!             if name[:2] == 'A_':
!                 _type_to_name_map[eval(name)] = name[2:]
!     if _type_to_name_map.has_key(gtype):
!         return _type_to_name_map[gtype]
!     return 'TYPE=' + `gtype`
  
  # Names for characters and strings
***************
*** 54,208 ****
  TAB = '\t'
  
- # Send a selector to a given host and port, return a file with the reply
  def send_selector(selector, host, port = 0):
! 	import socket
! 	import string
! 	if not port:
! 		i = string.find(host, ':')
! 		if i >= 0:
! 			host, port = host[:i], string.atoi(host[i+1:])
! 	if not port:
! 		port = DEF_PORT
! 	elif type(port) == type(''):
! 		port = string.atoi(port)
! 	s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! 	s.connect(host, port)
! 	s.send(selector + CRLF)
! 	s.shutdown(1)
! 	return s.makefile('rb')
  
- # Send a selector and a query string
  def send_query(selector, query, host, port = 0):
! 	return send_selector(selector + '\t' + query, host, port)
  
- # Takes a path as returned by urlparse and returns the appropriate selector
  def path_to_selector(path):
! 	if path=="/":
! 		return "/"
! 	else:
! 		return path[2:] # Cuts initial slash and data type identifier
  
- # Takes a path as returned by urlparse and maps it to a string
- # See section 3.4 of RFC 1738 for details
  def path_to_datatype_name(path):
! 	if path=="/":
! 		# No way to tell, although "INDEX" is likely
! 		return "TYPE='unknown'"
! 	else:
! 		return type_to_name(path[1])
  
  # The following functions interpret the data returned by the gopher
  # server according to the expected type, e.g. textfile or directory
  
- # Get a directory in the form of a list of entries
  def get_directory(f):
! 	import string
! 	list = []
! 	while 1:
! 		line = f.readline()
! 		if not line:
! 			print '(Unexpected EOF from server)'
! 			break
! 		if line[-2:] == CRLF:
! 			line = line[:-2]
! 		elif line[-1:] in CRLF:
! 			line = line[:-1]
! 		if line == '.':
! 			break
! 		if not line:
! 			print '(Empty line from server)'
! 			continue
! 		gtype = line[0]
! 		parts = string.splitfields(line[1:], TAB)
! 		if len(parts) < 4:
! 			print '(Bad line from server:', `line`, ')'
! 			continue
! 		if len(parts) > 4:
! 			if parts[4:] != ['+']:
! 				print '(Extra info from server:',
! 				print parts[4:], ')'
! 		else:
! 			parts.append('')
! 		parts.insert(0, gtype)
! 		list.append(parts)
! 	return list
  
- # Get a text file as a list of lines, with trailing CRLF stripped
  def get_textfile(f):
! 	list = []
! 	get_alt_textfile(f, list.append)
! 	return list
  
- # Get a text file and pass each line to a function, with trailing CRLF stripped
  def get_alt_textfile(f, func):
! 	while 1:
! 		line = f.readline()
! 		if not line:
! 			print '(Unexpected EOF from server)'
! 			break
! 		if line[-2:] == CRLF:
! 			line = line[:-2]
! 		elif line[-1:] in CRLF:
! 			line = line[:-1]
! 		if line == '.':
! 			break
! 		if line[:2] == '..':
! 			line = line[1:]
! 		func(line)
  
- # Get a binary file as one solid data block
  def get_binary(f):
! 	data = f.read()
! 	return data
  
- # Get a binary file and pass each block to a function
  def get_alt_binary(f, func, blocksize):
! 	while 1:
! 		data = f.read(blocksize)
! 		if not data:
! 			break
! 		func(data)
  
- # Trivial test program
  def test():
! 	import sys
! 	import getopt
! 	opts, args = getopt.getopt(sys.argv[1:], '')
! 	selector = DEF_SELECTOR
! 	type = selector[0]
! 	host = DEF_HOST
! 	port = DEF_PORT
! 	if args:
! 		host = args[0]
! 		args = args[1:]
! 	if args:
! 		type = args[0]
! 		args = args[1:]
! 		if len(type) > 1:
! 			type, selector = type[0], type
! 		else:
! 			selector = ''
! 			if args:
! 				selector = args[0]
! 				args = args[1:]
! 		query = ''
! 		if args:
! 			query = args[0]
! 			args = args[1:]
! 	if type == A_INDEX:
! 		f = send_query(selector, query, host)
! 	else:
! 		f = send_selector(selector, host)
! 	if type == A_TEXT:
! 		list = get_textfile(f)
! 		for item in list: print item
! 	elif type in (A_MENU, A_INDEX):
! 		list = get_directory(f)
! 		for item in list: print item
! 	else:
! 		data = get_binary(f)
! 		print 'binary data:', len(data), 'bytes:', `data[:100]`[:40]
  
  # Run the test when run as script
  if __name__ == '__main__':
! 	test()
--- 54,208 ----
  TAB = '\t'
  
  def send_selector(selector, host, port = 0):
!     """Send a selector to a given host and port, return a file with the reply."""
!     import socket
!     import string
!     if not port:
!         i = string.find(host, ':')
!         if i >= 0:
!             host, port = host[:i], string.atoi(host[i+1:])
!     if not port:
!         port = DEF_PORT
!     elif type(port) == type(''):
!         port = string.atoi(port)
!     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
!     s.connect(host, port)
!     s.send(selector + CRLF)
!     s.shutdown(1)
!     return s.makefile('rb')
  
  def send_query(selector, query, host, port = 0):
!     """Send a selector and a query string."""
!     return send_selector(selector + '\t' + query, host, port)
  
  def path_to_selector(path):
!     """Takes a path as returned by urlparse and returns the appropriate selector."""
!     if path=="/":
!         return "/"
!     else:
!         return path[2:] # Cuts initial slash and data type identifier
  
  def path_to_datatype_name(path):
!     """Takes a path as returned by urlparse and maps it to a string.
!     See section 3.4 of RFC 1738 for details."""
!     if path=="/":
!         # No way to tell, although "INDEX" is likely
!         return "TYPE='unknown'"
!     else:
!         return type_to_name(path[1])
  
  # The following functions interpret the data returned by the gopher
  # server according to the expected type, e.g. textfile or directory
  
  def get_directory(f):
!     """Get a directory in the form of a list of entries."""
!     import string
!     list = []
!     while 1:
!         line = f.readline()
!         if not line:
!             print '(Unexpected EOF from server)'
!             break
!         if line[-2:] == CRLF:
!             line = line[:-2]
!         elif line[-1:] in CRLF:
!             line = line[:-1]
!         if line == '.':
!             break
!         if not line:
!             print '(Empty line from server)'
!             continue
!         gtype = line[0]
!         parts = string.splitfields(line[1:], TAB)
!         if len(parts) < 4:
!             print '(Bad line from server:', `line`, ')'
!             continue
!         if len(parts) > 4:
!             if parts[4:] != ['+']:
!                 print '(Extra info from server:',
!                 print parts[4:], ')'
!         else:
!             parts.append('')
!         parts.insert(0, gtype)
!         list.append(parts)
!     return list
  
  def get_textfile(f):
!     """Get a text file as a list of lines, with trailing CRLF stripped."""
!     list = []
!     get_alt_textfile(f, list.append)
!     return list
  
  def get_alt_textfile(f, func):
!     """Get a text file and pass each line to a function, with trailing CRLF stripped."""
!     while 1:
!         line = f.readline()
!         if not line:
!             print '(Unexpected EOF from server)'
!             break
!         if line[-2:] == CRLF:
!             line = line[:-2]
!         elif line[-1:] in CRLF:
!             line = line[:-1]
!         if line == '.':
!             break
!         if line[:2] == '..':
!             line = line[1:]
!         func(line)
  
  def get_binary(f):
!     """Get a binary file as one solid data block."""
!     data = f.read()
!     return data
  
  def get_alt_binary(f, func, blocksize):
!     """Get a binary file and pass each block to a function."""
!     while 1:
!         data = f.read(blocksize)
!         if not data:
!             break
!         func(data)
  
  def test():
!     """Trivial test program."""
!     import sys
!     import getopt
!     opts, args = getopt.getopt(sys.argv[1:], '')
!     selector = DEF_SELECTOR
!     type = selector[0]
!     host = DEF_HOST
!     port = DEF_PORT
!     if args:
!         host = args[0]
!         args = args[1:]
!     if args:
!         type = args[0]
!         args = args[1:]
!         if len(type) > 1:
!             type, selector = type[0], type
!         else:
!             selector = ''
!             if args:
!                 selector = args[0]
!                 args = args[1:]
!         query = ''
!         if args:
!             query = args[0]
!             args = args[1:]
!     if type == A_INDEX:
!         f = send_query(selector, query, host)
!     else:
!         f = send_selector(selector, host)
!     if type == A_TEXT:
!         list = get_textfile(f)
!         for item in list: print item
!     elif type in (A_MENU, A_INDEX):
!         list = get_directory(f)
!         for item in list: print item
!     else:
!         data = get_binary(f)
!         print 'binary data:', len(data), 'bytes:', `data[:100]`[:40]
  
  # Run the test when run as script
  if __name__ == '__main__':
!     test()

Index: gzip.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/gzip.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** gzip.py	2000/02/02 16:51:06	1.15
--- gzip.py	2000/02/04 15:10:32	1.16
***************
*** 1,2 ****
--- 1,8 ----
+ """This module implements a function that reads and writes a gzipped file.
+ The user of the file doesn't have to worry about the compression,
+ but random access is not allowed."""
+ 
+ # based on Andrew Kuchling's minigzip.py distributed with the zlib module
+ 
  import time
  import string
***************
*** 4,13 ****
  import struct
  import __builtin__
- 
- # implements a python function that reads and writes a gzipped file
- # the user of the file doesn't have to worry about the compression,
- # but random access is not allowed
- 
- # based on Andrew Kuchling's minigzip.py distributed with the zlib module
  
  FTEXT, FHCRC, FEXTRA, FNAME, FCOMMENT = 1, 2, 4, 8, 16
--- 10,13 ----

Index: htmlentitydefs.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/htmlentitydefs.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** htmlentitydefs.py	1999/08/19 15:59:35	1.4
--- htmlentitydefs.py	2000/02/04 15:10:33	1.5
***************
*** 1,2 ****
--- 1,4 ----
+ """HTML character entity references."""
+ 
  entitydefs = {
      'AElig':	'\306',  	# latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1

Index: imghdr.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imghdr.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** imghdr.py	1997/10/08 15:22:32	1.8
--- imghdr.py	2000/02/04 15:10:33	1.9
***************
*** 1,3 ****
! # Recognizing image files based on their first few bytes.
  
  
--- 1,3 ----
! """Recognize image file formats based on their first few bytes."""
  
  
***************
*** 7,29 ****
  
  def what(file, h=None):
! 	if h is None:
! 		if type(file) == type(''):
! 			f = open(file, 'rb')
! 			h = f.read(32)
! 		else:
! 			location = file.tell()
! 			h = file.read(32)
! 			file.seek(location)
! 			f = None	
! 	else:
! 		f = None
! 	try:
! 		for tf in tests:
! 			res = tf(h, f)
! 			if res:
! 				return res
! 	finally:
! 		if f: f.close()
! 	return None
  
  
--- 7,29 ----
  
  def what(file, h=None):
!     if h is None:
!         if type(file) == type(''):
!             f = open(file, 'rb')
!             h = f.read(32)
!         else:
!             location = file.tell()
!             h = file.read(32)
!             file.seek(location)
!             f = None    
!     else:
!         f = None
!     try:
!         for tf in tests:
!             res = tf(h, f)
!             if res:
!                 return res
!     finally:
!         if f: f.close()
!     return None
  
  
***************
*** 35,113 ****
  
  def test_rgb(h, f):
! 	# SGI image library
! 	if h[:2] == '\001\332':
! 		return 'rgb'
  
  tests.append(test_rgb)
  
  def test_gif(h, f):
! 	# GIF ('87 and '89 variants)
! 	if h[:6] in ('GIF87a', 'GIF89a'):
! 		return 'gif'
  
  tests.append(test_gif)
  
  def test_pbm(h, f):
! 	# PBM (portable bitmap)
! 	if len(h) >= 3 and \
! 		h[0] == 'P' and h[1] in '14' and h[2] in ' \t\n\r':
! 		return 'pbm'
  
  tests.append(test_pbm)
  
  def test_pgm(h, f):
! 	# PGM (portable graymap)
! 	if len(h) >= 3 and \
! 		h[0] == 'P' and h[1] in '25' and h[2] in ' \t\n\r':
! 		return 'pgm'
  
  tests.append(test_pgm)
  
  def test_ppm(h, f):
! 	# PPM (portable pixmap)
! 	if len(h) >= 3 and \
! 		h[0] == 'P' and h[1] in '36' and h[2] in ' \t\n\r':
! 		return 'ppm'
  
  tests.append(test_ppm)
  
  def test_tiff(h, f):
! 	# TIFF (can be in Motorola or Intel byte order)
! 	if h[:2] in ('MM', 'II'):
! 		return 'tiff'
  
  tests.append(test_tiff)
  
  def test_rast(h, f):
! 	# Sun raster file
! 	if h[:4] == '\x59\xA6\x6A\x95':
! 		return 'rast'
  
  tests.append(test_rast)
  
  def test_xbm(h, f):
! 	# X bitmap (X10 or X11)
! 	s = '#define '
! 	if h[:len(s)] == s:
! 		return 'xbm'
  
  tests.append(test_xbm)
  
  def test_jpeg(h, f):
! 	# JPEG data in JFIF format
! 	if h[6:10] == 'JFIF':
! 		return 'jpeg'
  
  tests.append(test_jpeg)
  
  def test_bmp(h, f):
! 	if h[:2] == 'BM':
! 		return 'bmp'
! 		
  tests.append(test_bmp)
  
  def test_png(h, f):
! 	if h[:8] == "\211PNG\r\n\032\n":
! 		return 'png'
  
  tests.append(test_png)
--- 35,113 ----
  
  def test_rgb(h, f):
!     """SGI image library"""
!     if h[:2] == '\001\332':
!         return 'rgb'
  
  tests.append(test_rgb)
  
  def test_gif(h, f):
!     """GIF ('87 and '89 variants)"""
!     if h[:6] in ('GIF87a', 'GIF89a'):
!         return 'gif'
  
  tests.append(test_gif)
  
  def test_pbm(h, f):
!     """PBM (portable bitmap)"""
!     if len(h) >= 3 and \
!         h[0] == 'P' and h[1] in '14' and h[2] in ' \t\n\r':
!         return 'pbm'
  
  tests.append(test_pbm)
  
  def test_pgm(h, f):
!     """PGM (portable graymap)"""
!     if len(h) >= 3 and \
!         h[0] == 'P' and h[1] in '25' and h[2] in ' \t\n\r':
!         return 'pgm'
  
  tests.append(test_pgm)
  
  def test_ppm(h, f):
!     """PPM (portable pixmap)"""
!     if len(h) >= 3 and \
!         h[0] == 'P' and h[1] in '36' and h[2] in ' \t\n\r':
!         return 'ppm'
  
  tests.append(test_ppm)
  
  def test_tiff(h, f):
!     """TIFF (can be in Motorola or Intel byte order)"""
!     if h[:2] in ('MM', 'II'):
!         return 'tiff'
  
  tests.append(test_tiff)
  
  def test_rast(h, f):
!     """Sun raster file"""
!     if h[:4] == '\x59\xA6\x6A\x95':
!         return 'rast'
  
  tests.append(test_rast)
  
  def test_xbm(h, f):
!     """X bitmap (X10 or X11)"""
!     s = '#define '
!     if h[:len(s)] == s:
!         return 'xbm'
  
  tests.append(test_xbm)
  
  def test_jpeg(h, f):
!     """JPEG data in JFIF format"""
!     if h[6:10] == 'JFIF':
!         return 'jpeg'
  
  tests.append(test_jpeg)
  
  def test_bmp(h, f):
!     if h[:2] == 'BM':
!         return 'bmp'
!         
  tests.append(test_bmp)
  
  def test_png(h, f):
!     if h[:8] == "\211PNG\r\n\032\n":
!         return 'png'
  
  tests.append(test_png)
***************
*** 118,153 ****
  
  def test():
! 	import sys
! 	recursive = 0
! 	if sys.argv[1:] and sys.argv[1] == '-r':
! 		del sys.argv[1:2]
! 		recursive = 1
! 	try:
! 		if sys.argv[1:]:
! 			testall(sys.argv[1:], recursive, 1)
! 		else:
! 			testall(['.'], recursive, 1)
! 	except KeyboardInterrupt:
! 		sys.stderr.write('\n[Interrupted]\n')
! 		sys.exit(1)
  
  def testall(list, recursive, toplevel):
! 	import sys
! 	import os
! 	for filename in list:
! 		if os.path.isdir(filename):
! 			print filename + '/:',
! 			if recursive or toplevel:
! 				print 'recursing down:'
! 				import glob
! 				names = glob.glob(os.path.join(filename, '*'))
! 				testall(names, recursive, 0)
! 			else:
! 				print '*** directory (use -r) ***'
! 		else:
! 			print filename + ':',
! 			sys.stdout.flush()
! 			try:
! 				print what(filename)
! 			except IOError:
! 				print '*** not found ***'
--- 118,153 ----
  
  def test():
!     import sys
!     recursive = 0
!     if sys.argv[1:] and sys.argv[1] == '-r':
!         del sys.argv[1:2]
!         recursive = 1
!     try:
!         if sys.argv[1:]:
!             testall(sys.argv[1:], recursive, 1)
!         else:
!             testall(['.'], recursive, 1)
!     except KeyboardInterrupt:
!         sys.stderr.write('\n[Interrupted]\n')
!         sys.exit(1)
  
  def testall(list, recursive, toplevel):
!     import sys
!     import os
!     for filename in list:
!         if os.path.isdir(filename):
!             print filename + '/:',
!             if recursive or toplevel:
!                 print 'recursing down:'
!                 import glob
!                 names = glob.glob(os.path.join(filename, '*'))
!                 testall(names, recursive, 0)
!             else:
!                 print '*** directory (use -r) ***'
!         else:
!             print filename + ':',
!             sys.stdout.flush()
!             try:
!                 print what(filename)
!             except IOError:
!                 print '*** not found ***'

Index: keyword.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/keyword.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** keyword.py	1998/03/26 21:12:18	1.7
--- keyword.py	2000/02/04 15:10:33	1.8
***************
*** 1,12 ****
  #! /usr/bin/env python
! #
! #  Keywords (from "graminit.c")
! #
! #  This file is automatically generated; please don't muck it up!
! #
! #  To update the symbols in this file, 'cd' to the top directory of
! #  the python source tree after building the interpreter and run:
! #
! #    python Lib/keyword.py
  
  kwlist = [
--- 1,13 ----
  #! /usr/bin/env python
! 
! """Keywords (from "graminit.c")
! 
! This file is automatically generated; please don't muck it up!
! 
! To update the symbols in this file, 'cd' to the top directory of
! the python source tree after building the interpreter and run:
! 
!     python Lib/keyword.py
! """
  
  kwlist = [

Index: linecache.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/linecache.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** linecache.py	1995/08/10 19:32:22	1.4
--- linecache.py	2000/02/04 15:10:33	1.5
***************
*** 1,7 ****
! # Cache lines from files.
! # This is intended to read lines from modules imported -- hence if a filename
! # is not found, it will look down the module search path for a file by
! # that name.
  
  import sys
  import os
--- 1,9 ----
! """Cache lines from files.
  
+ This is intended to read lines from modules imported -- hence if a filename
+ is not found, it will look down the module search path for a file by
+ that name.
+ """
+ 
  import sys
  import os
***************
*** 9,17 ****
  
  def getline(filename, lineno):
! 	lines = getlines(filename)
! 	if 1 <= lineno <= len(lines):
! 		return lines[lineno-1]
! 	else:
! 		return ''
  
  
--- 11,19 ----
  
  def getline(filename, lineno):
!     lines = getlines(filename)
!     if 1 <= lineno <= len(lines):
!         return lines[lineno-1]
!     else:
!         return ''
  
  
***************
*** 21,90 ****
  
  
- # Clear the cache entirely
- 
  def clearcache():
! 	global cache
! 	cache = {}
  
  
- # Get the lines for a file from the cache.
- # Update the cache if it doesn't contain an entry for this file already.
  
  def getlines(filename):
! 	if cache.has_key(filename):
! 		return cache[filename][2]
! 	else:
! 		return updatecache(filename)
  
  
- # Discard cache entries that are out of date.
- # (This is not checked upon each call!)
  
  def checkcache():
! 	for filename in cache.keys():
! 		size, mtime, lines, fullname = cache[filename]
! 		try:
! 			stat = os.stat(fullname)
! 		except os.error:
! 			del cache[filename]
! 			continue
! 		if size <> stat[ST_SIZE] or mtime <> stat[ST_MTIME]:
! 			del cache[filename]
  
  
- # Update a cache entry and return its list of lines.
- # If something's wrong, print a message, discard the cache entry,
- # and return an empty list.
  
  def updatecache(filename):
! 	if cache.has_key(filename):
! 		del cache[filename]
! 	if not filename or filename[0] + filename[-1] == '<>':
! 		return []
! 	fullname = filename
! 	try:
! 		stat = os.stat(fullname)
! 	except os.error, msg:
! 		# Try looking through the module search path
! 		basename = os.path.split(filename)[1]
! 		for dirname in sys.path:
! 			fullname = os.path.join(dirname, basename)
! 			try:
! 				stat = os.stat(fullname)
! 				break
! 			except os.error:
! 				pass
! 		else:
! 			# No luck
! ##			print '*** Cannot stat', filename, ':', msg
! 			return []
! 	try:
! 		fp = open(fullname, 'r')
! 		lines = fp.readlines()
! 		fp.close()
! 	except IOError, msg:
! ##		print '*** Cannot open', fullname, ':', msg
! 		return []
! 	size, mtime = stat[ST_SIZE], stat[ST_MTIME]
! 	cache[filename] = size, mtime, lines, fullname
! 	return lines
--- 23,92 ----
  
  
  def clearcache():
!     """Clear the cache entirely."""
  
+     global cache
+     cache = {}
  
  
  def getlines(filename):
!     """Get the lines for a file from the cache.
!     Update the cache if it doesn't contain an entry for this file already."""
  
+     if cache.has_key(filename):
+         return cache[filename][2]
+     else:
+         return updatecache(filename)
  
  
  def checkcache():
!     """Discard cache entries that are out of date.
!     (This is not checked upon each call!)"""
  
+     for filename in cache.keys():
+         size, mtime, lines, fullname = cache[filename]
+         try:
+             stat = os.stat(fullname)
+         except os.error:
+             del cache[filename]
+             continue
+         if size <> stat[ST_SIZE] or mtime <> stat[ST_MTIME]:
+             del cache[filename]
  
  
  def updatecache(filename):
!     """Update a cache entry and return its list of lines.
!     If something's wrong, print a message, discard the cache entry,
!     and return an empty list."""
! 
!     if cache.has_key(filename):
!         del cache[filename]
!     if not filename or filename[0] + filename[-1] == '<>':
!         return []
!     fullname = filename
!     try:
!         stat = os.stat(fullname)
!     except os.error, msg:
!         # Try looking through the module search path
!         basename = os.path.split(filename)[1]
!         for dirname in sys.path:
!             fullname = os.path.join(dirname, basename)
!             try:
!                 stat = os.stat(fullname)
!                 break
!             except os.error:
!                 pass
!         else:
!             # No luck
! ##          print '*** Cannot stat', filename, ':', msg
!             return []
!     try:
!         fp = open(fullname, 'r')
!         lines = fp.readlines()
!         fp.close()
!     except IOError, msg:
! ##      print '*** Cannot open', fullname, ':', msg
!         return []
!     size, mtime = stat[ST_SIZE], stat[ST_MTIME]
!     cache[filename] = size, mtime, lines, fullname
!     return lines

Index: macpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/macpath.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** macpath.py	1999/07/23 15:04:05	1.20
--- macpath.py	2000/02/04 15:10:33	1.21
***************
*** 1,3 ****
! # module 'macpath' -- pathname (or -related) operations for the Macintosh
  
  import string
--- 1,3 ----
! """Pathname and path-related operations for the Macintosh."""
  
  import string
***************
*** 11,85 ****
  
  
- # Return true if a path is absolute.
- # On the Mac, relative paths begin with a colon,
- # but as a special case, paths with no colons at all are also relative.
- # Anything else is absolute (the string up to the first colon is the
- # volume name).
- 
  def isabs(s):
! 	return ':' in s and s[0] <> ':'
  
  
  def join(s, *p):
! 	path = s
! 	for t in p:
! 		if (not s) or isabs(t):
! 			path = t
! 			continue
! 		if t[:1] == ':':
! 			t = t[1:]
! 		if ':' not in path:
! 			path = ':' + path
! 		if path[-1:] <> ':':
! 			path = path + ':'
! 		path = path + t
! 	return path
! 
! 
! # Split a pathname in two parts: the directory leading up to the final bit,
! # and the basename (the filename, without colons, in that directory).
! # The result (s, t) is such that join(s, t) yields the original argument.
  
- def split(s):
- 	if ':' not in s: return '', s
- 	colon = 0
- 	for i in range(len(s)):
- 		if s[i] == ':': colon = i+1
- 	path, file = s[:colon-1], s[colon:]
- 	if path and not ':' in path:
- 		path = path + ':'
- 	return path, file
  
  
- # Split a path in root and extension.
- # The extension is everything starting at the last dot in the last
- # pathname component; the root is everything before that.
- # It is always true that root + ext == p.
  
  def splitext(p):
! 	root, ext = '', ''
! 	for c in p:
! 		if c == ':':
! 			root, ext = root + ext + c, ''
! 		elif c == '.':
! 			if ext:
! 				root, ext = root + ext, c
! 			else:
! 				ext = c
! 		elif ext:
! 			ext = ext + c
! 		else:
! 			root = root + c
! 	return root, ext
! 
! 
! # Split a pathname into a drive specification and the rest of the
! # path.  Useful on DOS/Windows/NT; on the Mac, the drive is always
! # empty (don't use the volume name -- it doesn't have the same
! # syntactic and semantic oddities as DOS drive letters, such as there
! # being a separate current directory per drive).
  
  def splitdrive(p):
! 	return '', p
  
  
--- 11,85 ----
  
  
  def isabs(s):
!     """Return true if a path is absolute.
!     On the Mac, relative paths begin with a colon,
!     but as a special case, paths with no colons at all are also relative.
!     Anything else is absolute (the string up to the first colon is the
!     volume name)."""
! 
!     return ':' in s and s[0] <> ':'
  
  
  def join(s, *p):
!     path = s
!     for t in p:
!         if (not s) or isabs(t):
!             path = t
!             continue
!         if t[:1] == ':':
!             t = t[1:]
!         if ':' not in path:
!             path = ':' + path
!         if path[-1:] <> ':':
!             path = path + ':'
!         path = path + t
!     return path
  
  
+ def split(s):
+     """Split a pathname into two parts: the directory leading up to the final
+     bit, and the basename (the filename, without colons, in that directory).
+     The result (s, t) is such that join(s, t) yields the original argument."""
+ 
+     if ':' not in s: return '', s
+     colon = 0
+     for i in range(len(s)):
+         if s[i] == ':': colon = i+1
+     path, file = s[:colon-1], s[colon:]
+     if path and not ':' in path:
+         path = path + ':'
+     return path, file
  
  
  def splitext(p):
!     """Split a path into root and extension.
!     The extension is everything starting at the last dot in the last
!     pathname component; the root is everything before that.
!     It is always true that root + ext == p."""
! 
!     root, ext = '', ''
!     for c in p:
!         if c == ':':
!             root, ext = root + ext + c, ''
!         elif c == '.':
!             if ext:
!                 root, ext = root + ext, c
!             else:
!                 ext = c
!         elif ext:
!             ext = ext + c
!         else:
!             root = root + c
!     return root, ext
  
+ 
  def splitdrive(p):
!     """Split a pathname into a drive specification and the rest of the
!     path.  Useful on DOS/Windows/NT; on the Mac, the drive is always
!     empty (don't use the volume name -- it doesn't have the same
!     syntactic and semantic oddities as DOS drive letters, such as there
!     being a separate current directory per drive)."""
! 
!     return '', p
  
  
***************
*** 90,101 ****
  
  
- # Return true if the pathname refers to an existing directory.
- 
  def isdir(s):
! 	try:
! 		st = os.stat(s)
! 	except os.error:
! 		return 0
! 	return S_ISDIR(st[ST_MODE])
  
  
--- 90,101 ----
  
  
  def isdir(s):
!     """Return true if the pathname refers to an existing directory."""
! 
!     try:
!         st = os.stat(s)
!     except os.error:
!         return 0
!     return S_ISDIR(st[ST_MODE])
  
  
***************
*** 118,220 ****
  
  
- # Return true if the pathname refers to a symbolic link.
- # (Always false on the Mac, until we understand Aliases.)
- 
  def islink(s):
! 	return 0
  
  
- # Return true if the pathname refers to an existing regular file.
  
  def isfile(s):
! 	try:
! 		st = os.stat(s)
! 	except os.error:
! 		return 0
! 	return S_ISREG(st[ST_MODE])
  
  
- # Return true if the pathname refers to an existing file or directory.
  
  def exists(s):
! 	try:
! 		st = os.stat(s)
! 	except os.error:
! 		return 0
! 	return 1
! 
! #
! # dummy expandvars to retain interface-compatability with other
! # operating systems.
  def expandvars(path):
! 	return path
  
- #
- # dummy expanduser to retain interface-compatability with other
- # operating systems.
- def expanduser(path):
- 	return path
  
! # Normalize a pathname: get rid of '::' sequences by backing up,
! # e.g., 'foo:bar::bletch' becomes 'foo:bletch'.
! # Raise the exception norm_error below if backing up is impossible,
! # e.g., for '::foo'.
! # XXX The Unix version doesn't raise an exception but simply
! # returns an unnormalized path.  Should do so here too.
  
  norm_error = 'macpath.norm_error: path cannot be normalized'
  
  def normpath(s):
! 	import string
! 	if ':' not in s:
! 		return ':' + s
! 	f = string.splitfields(s, ':')
! 	pre = []
! 	post = []
! 	if not f[0]:
! 		pre = f[:1]
! 		f = f[1:]
! 	if not f[len(f)-1]:
! 		post = f[-1:]
! 		f = f[:-1]
! 	res = []
! 	for seg in f:
! 		if seg:
! 			res.append(seg)
! 		else:
! 			if not res: raise norm_error, 'path starts with ::'
! 			del res[len(res)-1]
! 			if not (pre or res):
! 				raise norm_error, 'path starts with volume::'
! 	if pre: res = pre + res
! 	if post: res = res + post
! 	s = res[0]
! 	for seg in res[1:]:
! 		s = s + ':' + seg
! 	return s
! 
! 
! # Directory tree walk.
! # For each directory under top (including top itself),
! # func(arg, dirname, filenames) is called, where
! # dirname is the name of the directory and filenames is the list
! # of files (and subdirectories etc.) in the directory.
! # The func may modify the filenames list, to implement a filter,
! # or to impose a different order of visiting.
  
  def walk(top, func, arg):
! 	try:
! 		names = os.listdir(top)
! 	except os.error:
! 		return
! 	func(arg, top, names)
! 	for name in names:
! 		name = join(top, name)
! 		if isdir(name):
! 			walk(name, func, arg)
  
  
- # Return an absolute path.
  def abspath(path):
      if not isabs(path):
          path = join(os.getcwd(), path)
--- 118,218 ----
  
  
  def islink(s):
!     """Return true if the pathname refers to a symbolic link.
!     Always false on the Mac, until we understand Aliases.)"""
  
+     return 0
  
  
  def isfile(s):
!     """Return true if the pathname refers to an existing regular file."""
  
+     try:
+         st = os.stat(s)
+     except os.error:
+         return 0
+     return S_ISREG(st[ST_MODE])
  
  
  def exists(s):
!     """Return true if the pathname refers to an existing file or directory."""
! 
!     try:
!         st = os.stat(s)
!     except os.error:
!         return 0
!     return 1
! 
! 
  def expandvars(path):
!     """Dummy to retain interface-compatibility with other operating systems."""
!     return path
  
  
! def expanduser(path):
!     """Dummy to retain interface-compatibility with other operating systems."""
!     return path
  
  norm_error = 'macpath.norm_error: path cannot be normalized'
  
  def normpath(s):
!     """Normalize a pathname: get rid of '::' sequences by backing up,
!     e.g., 'foo:bar::bletch' becomes 'foo:bletch'.
!     Raise the exception norm_error below if backing up is impossible,
!     e.g., for '::foo'."""
!     # XXX The Unix version doesn't raise an exception but simply
!     # returns an unnormalized path.  Should do so here too.
! 
!     import string
!     if ':' not in s:
!         return ':' + s
!     f = string.splitfields(s, ':')
!     pre = []
!     post = []
!     if not f[0]:
!         pre = f[:1]
!         f = f[1:]
!     if not f[len(f)-1]:
!         post = f[-1:]
!         f = f[:-1]
!     res = []
!     for seg in f:
!         if seg:
!             res.append(seg)
!         else:
!             if not res: raise norm_error, 'path starts with ::'
!             del res[len(res)-1]
!             if not (pre or res):
!                 raise norm_error, 'path starts with volume::'
!     if pre: res = pre + res
!     if post: res = res + post
!     s = res[0]
!     for seg in res[1:]:
!         s = s + ':' + seg
!     return s
! 
  
  def walk(top, func, arg):
!     """Directory tree walk.
!     For each directory under top (including top itself),
!     func(arg, dirname, filenames) is called, where
!     dirname is the name of the directory and filenames is the list
!     of files (and subdirectories etc.) in the directory.
!     The func may modify the filenames list, to implement a filter,
!     or to impose a different order of visiting."""
! 
!     try:
!         names = os.listdir(top)
!     except os.error:
!         return
!     func(arg, top, names)
!     for name in names:
!         name = join(top, name)
!         if isdir(name):
!             walk(name, func, arg)
  
  
  def abspath(path):
+     """Return an absolute path."""
      if not isabs(path):
          path = join(os.getcwd(), path)

Index: mailcap.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mailcap.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** mailcap.py	1998/03/26 21:12:26	1.4
--- mailcap.py	2000/02/04 15:10:33	1.5
***************
*** 10,15 ****
      """Return a dictionary containing the mailcap database.
      
!     The dictionary maps a MIME type (in all lowercase,
!     e.g. 'text/plain') to a list of corresponding mailcap entries.
  
      """
--- 10,18 ----
      """Return a dictionary containing the mailcap database.
      
!     The dictionary maps a MIME type (in all lowercase, e.g. 'text/plain')
!     to a list of dictionaries corresponding to mailcap entries.  The list
!     collects all the entries for that MIME type from all available mailcap
!     files.  Each dictionary contains key-value pairs for that MIME type,
!     where the viewing command is stored with the key "view".
  
      """
***************
*** 49,52 ****
--- 52,63 ----
  
  def readmailcapfile(fp):
+     """Read a mailcap file and return a dictionary keyed by MIME type.
+ 
+     Each MIME type is mapped to an entry consisting of a list of
+     dictionaries; the list will contain more than one such dictionary
+     if a given MIME type appears more than once in the mailcap file.
+     Each dictionary contains key-value pairs for that MIME type, where
+     the viewing command is stored with the key "view".
+     """
      caps = {}
      while 1:
***************
*** 79,82 ****
--- 90,98 ----
  
  def parseline(line):
+     """Parse one entry in a mailcap file and return a dictionary.
+ 
+     The viewing command is stored as the value with the key "view",
+     and the rest of the fields produce key-value pairs in the dict.
+     """
      fields = []
      i, n = 0, len(line)
***************
*** 105,108 ****
--- 121,125 ----
  
  def parsefield(line, i, n):
+     """Separate one key-value pair in a mailcap entry."""
      start = i
      while i < n:

Index: mhlib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mhlib.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** mhlib.py	1999/02/24 16:25:17	1.18
--- mhlib.py	2000/02/04 15:10:33	1.19
***************
*** 1,56 ****
! # MH interface -- purely object-oriented (well, almost)
! #
! # Executive summary:
! #
! # import mhlib
! #
! # mh = mhlib.MH()         # use default mailbox directory and profile
! # mh = mhlib.MH(mailbox)  # override mailbox location (default from profile)
! # mh = mhlib.MH(mailbox, profile) # override mailbox and profile
! #
! # mh.error(format, ...)   # print error message -- can be overridden
! # s = mh.getprofile(key)  # profile entry (None if not set)
! # path = mh.getpath()     # mailbox pathname
! # name = mh.getcontext()  # name of current folder
! # mh.setcontext(name)     # set name of current folder
! #
! # list = mh.listfolders() # names of top-level folders
! # list = mh.listallfolders() # names of all folders, including subfolders
! # list = mh.listsubfolders(name) # direct subfolders of given folder
! # list = mh.listallsubfolders(name) # all subfolders of given folder
! #
! # mh.makefolder(name)     # create new folder
! # mh.deletefolder(name)   # delete folder -- must have no subfolders
! #
! # f = mh.openfolder(name) # new open folder object
! #
! # f.error(format, ...)    # same as mh.error(format, ...)
! # path = f.getfullname()  # folder's full pathname
! # path = f.getsequencesfilename() # full pathname of folder's sequences file
! # path = f.getmessagefilename(n)  # full pathname of message n in folder
! #
! # list = f.listmessages() # list of messages in folder (as numbers)
! # n = f.getcurrent()      # get current message
! # f.setcurrent(n)         # set current message
! # list = f.parsesequence(seq)     # parse msgs syntax into list of messages
! # n = f.getlast()         # get last message (0 if no messagse)
! # f.setlast(n)            # set last message (internal use only)
! #
! # dict = f.getsequences() # dictionary of sequences in folder {name: list}
! # f.putsequences(dict)    # write sequences back to folder
! #
! # f.createmessage(n, fp)  # add message from file f as number n
! # f.removemessages(list)  # remove messages in list from folder
! # f.refilemessages(list, tofolder) # move messages in list to other folder
! # f.movemessage(n, tofolder, ton)  # move one message to a given destination
! # f.copymessage(n, tofolder, ton)  # copy one message to a given destination
! #
! # m = f.openmessage(n)    # new open message object (costs a file descriptor)
! # m is a derived class of mimetools.Message(rfc822.Message), with:
! # s = m.getheadertext()   # text of message's headers
! # s = m.getheadertext(pred) # text of message's headers, filtered by pred
! # s = m.getbodytext()     # text of message's body, decoded
! # s = m.getbodytext(0)    # text of message's body, not decoded
! #
  # XXX To do, functionality:
  # - annotate messages
--- 1,57 ----
! """MH interface -- purely object-oriented (well, almost)
! 
! Executive summary:
! 
! import mhlib
! 
! mh = mhlib.MH()         # use default mailbox directory and profile
! mh = mhlib.MH(mailbox)  # override mailbox location (default from profile)
! mh = mhlib.MH(mailbox, profile) # override mailbox and profile
! 
! mh.error(format, ...)   # print error message -- can be overridden
! s = mh.getprofile(key)  # profile entry (None if not set)
! path = mh.getpath()     # mailbox pathname
! name = mh.getcontext()  # name of current folder
! mh.setcontext(name)     # set name of current folder
! 
! list = mh.listfolders() # names of top-level folders
! list = mh.listallfolders() # names of all folders, including subfolders
! list = mh.listsubfolders(name) # direct subfolders of given folder
! list = mh.listallsubfolders(name) # all subfolders of given folder
! 
! mh.makefolder(name)     # create new folder
! mh.deletefolder(name)   # delete folder -- must have no subfolders
! 
! f = mh.openfolder(name) # new open folder object
! 
! f.error(format, ...)    # same as mh.error(format, ...)
! path = f.getfullname()  # folder's full pathname
! path = f.getsequencesfilename() # full pathname of folder's sequences file
! path = f.getmessagefilename(n)  # full pathname of message n in folder
! 
! list = f.listmessages() # list of messages in folder (as numbers)
! n = f.getcurrent()      # get current message
! f.setcurrent(n)         # set current message
! list = f.parsesequence(seq)     # parse msgs syntax into list of messages
! n = f.getlast()         # get last message (0 if no messagse)
! f.setlast(n)            # set last message (internal use only)
! 
! dict = f.getsequences() # dictionary of sequences in folder {name: list}
! f.putsequences(dict)    # write sequences back to folder
! 
! f.createmessage(n, fp)  # add message from file f as number n
! f.removemessages(list)  # remove messages in list from folder
! f.refilemessages(list, tofolder) # move messages in list to other folder
! f.movemessage(n, tofolder, ton)  # move one message to a given destination
! f.copymessage(n, tofolder, ton)  # copy one message to a given destination
! 
! m = f.openmessage(n)    # new open message object (costs a file descriptor)
! m is a derived class of mimetools.Message(rfc822.Message), with:
! s = m.getheadertext()   # text of message's headers
! s = m.getheadertext(pred) # text of message's headers, filtered by pred
! s = m.getbodytext()     # text of message's body, decoded
! s = m.getbodytext(0)    # text of message's body, not decoded
! """
! 
  # XXX To do, functionality:
  # - annotate messages
***************
*** 88,101 ****
  
  
- # Class representing a particular collection of folders.
- # Optional constructor arguments are the pathname for the directory
- # containing the collection, and the MH profile to use.
- # If either is omitted or empty a default is used; the default
- # directory is taken from the MH profile if it is specified there.
- 
  class MH:
  
-     # Constructor
      def __init__(self, path = None, profile = None):
          if not profile: profile = MH_PROFILE
          self.profile = os.path.expanduser(profile)
--- 89,101 ----
  
  
  class MH:
+     """Class representing a particular collection of folders.
+     Optional constructor arguments are the pathname for the directory
+     containing the collection, and the MH profile to use.
+     If either is omitted or empty a default is used; the default
+     directory is taken from the MH profile if it is specified there."""
  
      def __init__(self, path = None, profile = None):
+         """Constructor."""
          if not profile: profile = MH_PROFILE
          self.profile = os.path.expanduser(profile)
***************
*** 108,129 ****
          self.path = path
  
-     # String representation
      def __repr__(self):
          return 'MH(%s, %s)' % (`self.path`, `self.profile`)
  
-     # Routine to print an error.  May be overridden by a derived class
      def error(self, msg, *args):
          sys.stderr.write('MH error: %s\n' % (msg % args))
  
-     # Return a profile entry, None if not found
      def getprofile(self, key):
          return pickline(self.profile, key)
  
-     # Return the path (the name of the collection's directory)
      def getpath(self):
          return self.path
  
-     # Return the name of the current folder
      def getcontext(self):
          context = pickline(os.path.join(self.getpath(), 'context'),
                    'Current-Folder')
--- 108,129 ----
          self.path = path
  
      def __repr__(self):
+         """String representation."""
          return 'MH(%s, %s)' % (`self.path`, `self.profile`)
  
      def error(self, msg, *args):
+         """Routine to print an error.  May be overridden by a derived class."""
          sys.stderr.write('MH error: %s\n' % (msg % args))
  
      def getprofile(self, key):
+         """Return a profile entry, None if not found."""
          return pickline(self.profile, key)
  
      def getpath(self):
+         """Return the path (the name of the collection's directory)."""
          return self.path
  
      def getcontext(self):
+         """Return the name of the current folder."""
          context = pickline(os.path.join(self.getpath(), 'context'),
                    'Current-Folder')
***************
*** 131,136 ****
          return context
  
-     # Set the name of the current folder
      def setcontext(self, context):
          fn = os.path.join(self.getpath(), 'context')
          f = open(fn, "w")
--- 131,136 ----
          return context
  
      def setcontext(self, context):
+         """Set the name of the current folder."""
          fn = os.path.join(self.getpath(), 'context')
          f = open(fn, "w")
***************
*** 138,143 ****
          f.close()
  
-     # Return the names of the top-level folders
      def listfolders(self):
          folders = []
          path = self.getpath()
--- 138,143 ----
          f.close()
  
      def listfolders(self):
+         """Return the names of the top-level folders."""
          folders = []
          path = self.getpath()
***************
*** 149,155 ****
          return folders
  
-     # Return the names of the subfolders in a given folder
-     # (prefixed with the given folder name)
      def listsubfolders(self, name):
          fullname = os.path.join(self.path, name)
          # Get the link count so we can avoid listing folders
--- 149,155 ----
          return folders
  
      def listsubfolders(self, name):
+         """Return the names of the subfolders in a given folder
+         (prefixed with the given folder name)."""
          fullname = os.path.join(self.path, name)
          # Get the link count so we can avoid listing folders
***************
*** 174,183 ****
          return subfolders
  
-     # Return the names of all folders, including subfolders, recursively
      def listallfolders(self):
          return self.listallsubfolders('')
  
-     # Return the names of subfolders in a given folder, recursively
      def listallsubfolders(self, name):
          fullname = os.path.join(self.path, name)
          # Get the link count so we can avoid listing folders
--- 174,183 ----
          return subfolders
  
      def listallfolders(self):
+         """Return the names of all folders and subfolders, recursively."""
          return self.listallsubfolders('')
  
      def listallsubfolders(self, name):
+         """Return the names of subfolders in a given folder, recursively."""
          fullname = os.path.join(self.path, name)
          # Get the link count so we can avoid listing folders
***************
*** 207,217 ****
          return subfolders
  
-     # Return a new Folder object for the named folder
      def openfolder(self, name):
          return Folder(self, name)
  
-     # Create a new folder.  This raises os.error if the folder
-     # cannot be created
      def makefolder(self, name):
          protect = pickline(self.profile, 'Folder-Protect')
          if protect and isnumeric(protect):
--- 207,216 ----
          return subfolders
  
      def openfolder(self, name):
+         """Return a new Folder object for the named folder."""
          return Folder(self, name)
  
      def makefolder(self, name):
+         """Create a new folder (or raise os.error if it cannot be created)."""
          protect = pickline(self.profile, 'Folder-Protect')
          if protect and isnumeric(protect):
***************
*** 221,228 ****
          os.mkdir(os.path.join(self.getpath(), name), mode)
  
-     # Delete a folder.  This removes files in the folder but not
-     # subdirectories.  If deleting the folder itself fails it
-     # raises os.error
      def deletefolder(self, name):
          fullname = os.path.join(self.getpath(), name)
          for subname in os.listdir(fullname):
--- 220,226 ----
          os.mkdir(os.path.join(self.getpath(), name), mode)
  
      def deletefolder(self, name):
+         """Delete a folder.  This removes files in the folder but not
+         subdirectories.  Raise os.error if deleting the folder itself fails."""
          fullname = os.path.join(self.getpath(), name)
          for subname in os.listdir(fullname):
***************
*** 236,241 ****
  
  
- # Class representing a particular folder
- 
  numericprog = re.compile('^[1-9][0-9]*$')
  def isnumeric(str):
--- 234,237 ----
***************
*** 243,249 ****
  
  class Folder:
  
-     # Constructor
      def __init__(self, mh, name):
          self.mh = mh
          self.name = name
--- 239,246 ----
  
  class Folder:
+     """Class representing a particular folder."""
  
      def __init__(self, mh, name):
+         """Constructor."""
          self.mh = mh
          self.name = name
***************
*** 251,285 ****
              raise Error, 'no folder %s' % name
  
-     # String representation
      def __repr__(self):
          return 'Folder(%s, %s)' % (`self.mh`, `self.name`)
  
-     # Error message handler
      def error(self, *args):
          apply(self.mh.error, args)
  
-     # Return the full pathname of the folder
      def getfullname(self):
          return os.path.join(self.mh.path, self.name)
  
-     # Return the full pathname of the folder's sequences file
      def getsequencesfilename(self):
          return os.path.join(self.getfullname(), MH_SEQUENCES)
  
-     # Return the full pathname of a message in the folder
      def getmessagefilename(self, n):
          return os.path.join(self.getfullname(), str(n))
  
-     # Return list of direct subfolders
      def listsubfolders(self):
          return self.mh.listsubfolders(self.name)
  
-     # Return list of all subfolders
      def listallsubfolders(self):
          return self.mh.listallsubfolders(self.name)
  
-     # Return the list of messages currently present in the folder.
-     # As a side effect, set self.last to the last message (or 0)
      def listmessages(self):
          messages = []
          match = numericprog.match
--- 248,282 ----
              raise Error, 'no folder %s' % name
  
      def __repr__(self):
+         """String representation."""
          return 'Folder(%s, %s)' % (`self.mh`, `self.name`)
  
      def error(self, *args):
+         """Error message handler."""
          apply(self.mh.error, args)
  
      def getfullname(self):
+         """Return the full pathname of the folder."""
          return os.path.join(self.mh.path, self.name)
  
      def getsequencesfilename(self):
+         """Return the full pathname of the folder's sequences file."""
          return os.path.join(self.getfullname(), MH_SEQUENCES)
  
      def getmessagefilename(self, n):
+         """Return the full pathname of a message in the folder."""
          return os.path.join(self.getfullname(), str(n))
  
      def listsubfolders(self):
+         """Return list of direct subfolders."""
          return self.mh.listsubfolders(self.name)
  
      def listallsubfolders(self):
+         """Return list of all subfolders."""
          return self.mh.listallsubfolders(self.name)
  
      def listmessages(self):
+         """Return the list of messages currently present in the folder.
+         As a side effect, set self.last to the last message (or 0)."""
          messages = []
          match = numericprog.match
***************
*** 296,301 ****
          return messages
  
-     # Return the set of sequences for the folder
      def getsequences(self):
          sequences = {}
          fullname = self.getsequencesfilename()
--- 293,298 ----
          return messages
  
      def getsequences(self):
+         """Return the set of sequences for the folder."""
          sequences = {}
          fullname = self.getsequencesfilename()
***************
*** 316,321 ****
          return sequences
  
-     # Write the set of sequences back to the folder
      def putsequences(self, sequences):
          fullname = self.getsequencesfilename()
          f = None
--- 313,318 ----
          return sequences
  
      def putsequences(self, sequences):
+         """Write the set of sequences back to the folder."""
          fullname = self.getsequencesfilename()
          f = None
***************
*** 333,338 ****
              f.close()
  
-     # Return the current message.  Raise KeyError when there is none
      def getcurrent(self):
          seqs = self.getsequences()
          try:
--- 330,335 ----
              f.close()
  
      def getcurrent(self):
+         """Return the current message.  Raise KeyError when there is none."""
          seqs = self.getsequences()
          try:
***************
*** 341,353 ****
              raise Error, "no cur message"
  
-     # Set the current message
      def setcurrent(self, n):
          updateline(self.getsequencesfilename(), 'cur', str(n), 0)
  
-     # Parse an MH sequence specification into a message list.
-     # Attempt to mimic mh-sequence(5) as close as possible.
-     # Also attempt to mimic observed behavior regarding which
-     # conditions cause which error messages
      def parsesequence(self, seq):
          # XXX Still not complete (see mh-format(5)).
          # Missing are:
--- 338,350 ----
              raise Error, "no cur message"
  
      def setcurrent(self, n):
+         """Set the current message."""
          updateline(self.getsequencesfilename(), 'cur', str(n), 0)
  
      def parsesequence(self, seq):
+         """Parse an MH sequence specification into a message list.
+         Attempt to mimic mh-sequence(5) as close as possible.
+         Also attempt to mimic observed behavior regarding which
+         conditions cause which error messages."""
          # XXX Still not complete (see mh-format(5)).
          # Missing are:
***************
*** 429,434 ****
                  return [n]
  
-     # Internal: parse a message number (or cur, first, etc.)
      def _parseindex(self, seq, all):
          if isnumeric(seq):
              try:
--- 426,431 ----
                  return [n]
  
      def _parseindex(self, seq, all):
+         """Internal: parse a message number (or cur, first, etc.)."""
          if isnumeric(seq):
              try:
***************
*** 460,469 ****
          raise Error, None
  
-     # Open a message -- returns a Message object
      def openmessage(self, n):
          return Message(self, n)
  
-     # Remove one or more messages -- may raise os.error
      def removemessages(self, list):
          errors = []
          deleted = []
--- 457,466 ----
          raise Error, None
  
      def openmessage(self, n):
+         """Open a message -- returns a Message object."""
          return Message(self, n)
  
      def removemessages(self, list):
+         """Remove one or more messages -- may raise os.error."""
          errors = []
          deleted = []
***************
*** 489,495 ****
                  raise os.error, ('multiple errors:', errors)
  
-     # Refile one or more messages -- may raise os.error.
-     # 'tofolder' is an open folder object
      def refilemessages(self, list, tofolder, keepsequences=0):
          errors = []
          refiled = {}
--- 486,492 ----
                  raise os.error, ('multiple errors:', errors)
  
      def refilemessages(self, list, tofolder, keepsequences=0):
+         """Refile one or more messages -- may raise os.error.
+         'tofolder' is an open folder object."""
          errors = []
          refiled = {}
***************
*** 524,529 ****
                  raise os.error, ('multiple errors:', errors)
  
-     # Helper for refilemessages() to copy sequences
      def _copysequences(self, fromfolder, refileditems):
          fromsequences = fromfolder.getsequences()
          tosequences = self.getsequences()
--- 521,526 ----
                  raise os.error, ('multiple errors:', errors)
  
      def _copysequences(self, fromfolder, refileditems):
+         """Helper for refilemessages() to copy sequences."""
          fromsequences = fromfolder.getsequences()
          tosequences = self.getsequences()
***************
*** 545,551 ****
              self.putsequences(tosequences)
  
-     # Move one message over a specific destination message,
-     # which may or may not already exist.
      def movemessage(self, n, tofolder, ton):
          path = self.getmessagefilename(n)
          # Open it to check that it exists
--- 542,548 ----
              self.putsequences(tosequences)
  
      def movemessage(self, n, tofolder, ton):
+         """Move one message over a specific destination message,
+         which may or may not already exist."""
          path = self.getmessagefilename(n)
          # Open it to check that it exists
***************
*** 577,583 ****
          self.removefromallsequences([n])
  
-     # Copy one message over a specific destination message,
-     # which may or may not already exist.
      def copymessage(self, n, tofolder, ton):
          path = self.getmessagefilename(n)
          # Open it to check that it exists
--- 574,580 ----
          self.removefromallsequences([n])
  
      def copymessage(self, n, tofolder, ton):
+         """Copy one message over a specific destination message,
+         which may or may not already exist."""
          path = self.getmessagefilename(n)
          # Open it to check that it exists
***************
*** 603,608 ****
                      pass
  
-     # Create a message, with text from the open file txt.
      def createmessage(self, n, txt):
          path = self.getmessagefilename(n)
          backuppath = self.getmessagefilename(',%d' % n)
--- 600,605 ----
                      pass
  
      def createmessage(self, n, txt):
+         """Create a message, with text from the open file txt."""
          path = self.getmessagefilename(n)
          backuppath = self.getmessagefilename(',%d' % n)
***************
*** 629,635 ****
                      pass
  
-     # Remove one or more messages from all sequeuces (including last)
-     # -- but not from 'cur'!!!
      def removefromallsequences(self, list):
          if hasattr(self, 'last') and self.last in list:
              del self.last
--- 626,632 ----
                      pass
  
      def removefromallsequences(self, list):
+         """Remove one or more messages from all sequeuces (including last)
+         -- but not from 'cur'!!!"""
          if hasattr(self, 'last') and self.last in list:
              del self.last
***************
*** 648,659 ****
              self.putsequences(sequences)
  
-     # Return the last message number
      def getlast(self):
          if not hasattr(self, 'last'):
              messages = self.listmessages()
          return self.last
  
-     # Set the last message number
      def setlast(self, last):
          if last is None:
              if hasattr(self, 'last'):
--- 645,656 ----
              self.putsequences(sequences)
  
      def getlast(self):
+         """Return the last message number."""
          if not hasattr(self, 'last'):
              messages = self.listmessages()
          return self.last
  
      def setlast(self, last):
+         """Set the last message number."""
          if last is None:
              if hasattr(self, 'last'):
***************
*** 664,669 ****
  class Message(mimetools.Message):
  
-     # Constructor
      def __init__(self, f, n, fp = None):
          self.folder = f
          self.number = n
--- 661,666 ----
  class Message(mimetools.Message):
  
      def __init__(self, f, n, fp = None):
+         """Constructor."""
          self.folder = f
          self.number = n
***************
*** 673,685 ****
          mimetools.Message.__init__(self, fp)
  
-     # String representation
      def __repr__(self):
          return 'Message(%s, %s)' % (repr(self.folder), self.number)
  
-     # Return the message's header text as a string.  If an
-     # argument is specified, it is used as a filter predicate to
-     # decide which headers to return (its argument is the header
-     # name converted to lower case).
      def getheadertext(self, pred = None):
          if not pred:
              return string.joinfields(self.headers, '')
--- 670,682 ----
          mimetools.Message.__init__(self, fp)
  
      def __repr__(self):
+         """String representation."""
          return 'Message(%s, %s)' % (repr(self.folder), self.number)
  
      def getheadertext(self, pred = None):
+         """Return the message's header text as a string.  If an
+         argument is specified, it is used as a filter predicate to
+         decide which headers to return (its argument is the header
+         name converted to lower case)."""
          if not pred:
              return string.joinfields(self.headers, '')
***************
*** 694,702 ****
          return string.joinfields(headers, '')
  
-     # Return the message's body text as string.  This undoes a
-     # Content-Transfer-Encoding, but does not interpret other MIME
-     # features (e.g. multipart messages).  To suppress to
-     # decoding, pass a 0 as argument
      def getbodytext(self, decode = 1):
          self.fp.seek(self.startofbody)
          encoding = self.getencoding()
--- 691,699 ----
          return string.joinfields(headers, '')
  
      def getbodytext(self, decode = 1):
+         """Return the message's body text as string.  This undoes a
+         Content-Transfer-Encoding, but does not interpret other MIME
+         features (e.g. multipart messages).  To suppress decoding,
+         pass 0 as an argument."""
          self.fp.seek(self.startofbody)
          encoding = self.getencoding()
***************
*** 708,715 ****
          return output.getvalue()
  
-     # Only for multipart messages: return the message's body as a
-     # list of SubMessage objects.  Each submessage object behaves
-     # (almost) as a Message object.
      def getbodyparts(self):
          if self.getmaintype() != 'multipart':
              raise Error, 'Content-Type is not multipart/*'
--- 705,712 ----
          return output.getvalue()
  
      def getbodyparts(self):
+         """Only for multipart messages: return the message's body as a
+         list of SubMessage objects.  Each submessage object behaves
+         (almost) as a Message object."""
          if self.getmaintype() != 'multipart':
              raise Error, 'Content-Type is not multipart/*'
***************
*** 728,733 ****
          return parts
  
-     # Return body, either a string or a list of messages
      def getbody(self):
          if self.getmaintype() == 'multipart':
              return self.getbodyparts()
--- 725,730 ----
          return parts
  
      def getbody(self):
+         """Return body, either a string or a list of messages."""
          if self.getmaintype() == 'multipart':
              return self.getbodyparts()
***************
*** 738,743 ****
  class SubMessage(Message):
  
-     # Constructor
      def __init__(self, f, n, fp):
          Message.__init__(self, f, n, fp)
          if self.getmaintype() == 'multipart':
--- 735,740 ----
  class SubMessage(Message):
  
      def __init__(self, f, n, fp):
+         """Constructor."""
          Message.__init__(self, f, n, fp)
          if self.getmaintype() == 'multipart':
***************
*** 748,753 ****
              # XXX If this is big, should remember file pointers
  
-     # String representation
      def __repr__(self):
          f, n, fp = self.folder, self.number, self.fp
          return 'SubMessage(%s, %s, %s)' % (f, n, fp)
--- 745,750 ----
              # XXX If this is big, should remember file pointers
  
      def __repr__(self):
+         """String representation."""
          f, n, fp = self.folder, self.number, self.fp
          return 'SubMessage(%s, %s, %s)' % (f, n, fp)
***************
*** 767,792 ****
  
  
- # Class implementing sets of integers.
- #
- # This is an efficient representation for sets consisting of several
- # continuous ranges, e.g. 1-100,200-400,402-1000 is represented
- # internally as a list of three pairs: [(1,100), (200,400),
- # (402,1000)].  The internal representation is always kept normalized.
- #
- # The constructor has up to three arguments:
- # - the string used to initialize the set (default ''),
- # - the separator between ranges (default ',')
- # - the separator between begin and end of a range (default '-')
- # The separators must be strings (not regexprs) and should be different.
- #
- # The tostring() function yields a string that can be passed to another
- # IntSet constructor; __repr__() is a valid IntSet constructor itself.
- #
- # XXX The default begin/end separator means that negative numbers are
- #     not supported very well.
- #
- # XXX There are currently no operations to remove set elements.
- 
  class IntSet:
  
      def __init__(self, data = None, sep = ',', rng = '-'):
--- 764,789 ----
  
  
  class IntSet:
+     """Class implementing sets of integers.
+ 
+     This is an efficient representation for sets consisting of several
+     continuous ranges, e.g. 1-100,200-400,402-1000 is represented
+     internally as a list of three pairs: [(1,100), (200,400),
+     (402,1000)].  The internal representation is always kept normalized.
+ 
+     The constructor has up to three arguments:
+     - the string used to initialize the set (default ''),
+     - the separator between ranges (default ',')
+     - the separator between begin and end of a range (default '-')
+     The separators must be strings (not regexprs) and should be different.
+ 
+     The tostring() function yields a string that can be passed to another
+     IntSet constructor; __repr__() is a valid IntSet constructor itself.
+     """
+ 
+     # XXX The default begin/end separator means that negative numbers are
+     #     not supported very well.
+     #
+     # XXX There are currently no operations to remove set elements.
  
      def __init__(self, data = None, sep = ',', rng = '-'):

Index: mimetools.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mimetools.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** mimetools.py	1998/05/20 17:05:35	1.15
--- mimetools.py	2000/02/04 15:10:33	1.16
***************
*** 1,3 ****
! # Various tools used by MIME-reading or MIME-writing programs.
  
  
--- 1,3 ----
! """Various tools used by MIME-reading or MIME-writing programs."""
  
  
***************
*** 8,15 ****
  
  
- # A derived class of rfc822.Message that knows about MIME headers and
- # contains some hooks for decoding encoded and multipart messages.
- 
  class Message(rfc822.Message):
  
  	def __init__(self, fp, seekable = 1):
--- 8,14 ----
  
  
  class Message(rfc822.Message):
+ 	"""A derived class of rfc822.Message that knows about MIME headers and
+ 	contains some hooks for decoding encoded and multipart messages."""
  
  	def __init__(self, fp, seekable = 1):
***************
*** 97,111 ****
  
  
- # Return a random string usable as a multipart boundary.
- # The method used is so that it is *very* unlikely that the same
- # string of characters will every occur again in the Universe,
- # so the caller needn't check the data it is packing for the
- # occurrence of the boundary.
- #
- # The boundary contains dots so you have to quote it in the header.
- 
  _prefix = None
  
  def choose_boundary():
  	global _prefix
  	import time
--- 96,110 ----
  
  
  _prefix = None
  
  def choose_boundary():
+ 	"""Return a random string usable as a multipart boundary.
+ 	The method used is so that it is *very* unlikely that the same
+ 	string of characters will every occur again in the Universe,
+ 	so the caller needn't check the data it is packing for the
+ 	occurrence of the boundary.
+ 
+ 	The boundary contains dots so you have to quote it in the header."""
+ 
  	global _prefix
  	import time
***************
*** 132,135 ****
--- 131,135 ----
  
  def decode(input, output, encoding):
+ 	"""Decode common content-transfer-encodings (base64, quopri, uuencode)."""
  	if encoding == 'base64':
  		import base64
***************
*** 148,151 ****
--- 148,152 ----
  
  def encode(input, output, encoding):
+ 	"""Encode common content-transfer-encodings (base64, quopri, uuencode)."""
  	if encoding == 'base64':
  		import base64

Index: mimify.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mimify.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** mimify.py	1998/08/07 15:26:56	1.13
--- mimify.py	2000/02/04 15:10:33	1.14
***************
*** 3,7 ****
  '''Mimification and unmimification of mail messages.
  
! decode quoted-printable parts of a mail message or encode using
  quoted-printable.
  
--- 3,7 ----
  '''Mimification and unmimification of mail messages.
  
! Decode quoted-printable parts of a mail message or encode using
  quoted-printable.
  
***************
*** 40,46 ****
  
  class File:
! 	'''A simple fake file object that knows about limited
! 	   read-ahead and boundaries.
! 	   The only supported method is readline().'''
  
  	def __init__(self, file, boundary):
--- 40,45 ----
  
  class File:
! 	"""A simple fake file object that knows about limited read-ahead and
! 	boundaries.  The only supported method is readline()."""
  
  	def __init__(self, file, boundary):
***************
*** 88,92 ****
  
  def mime_decode(line):
! 	'''Decode a single line of quoted-printable text to 8bit.'''
  	newline = ''
  	pos = 0
--- 87,91 ----
  
  def mime_decode(line):
! 	"""Decode a single line of quoted-printable text to 8bit."""
  	newline = ''
  	pos = 0
***************
*** 101,105 ****
  
  def mime_decode_header(line):
! 	'''Decode a header line to 8bit.'''
  	newline = ''
  	pos = 0
--- 100,104 ----
  
  def mime_decode_header(line):
! 	"""Decode a header line to 8bit."""
  	newline = ''
  	pos = 0
***************
*** 116,120 ****
  
  def unmimify_part(ifile, ofile, decode_base64 = 0):
! 	'''Convert a quoted-printable part of a MIME mail message to 8bit.'''
  	multipart = None
  	quoted_printable = 0
--- 115,119 ----
  
  def unmimify_part(ifile, ofile, decode_base64 = 0):
! 	"""Convert a quoted-printable part of a MIME mail message to 8bit."""
  	multipart = None
  	quoted_printable = 0
***************
*** 201,205 ****
  
  def unmimify(infile, outfile, decode_base64 = 0):
! 	'''Convert quoted-printable parts of a MIME mail message to 8bit.'''
  	if type(infile) == type(''):
  		ifile = open(infile)
--- 200,204 ----
  
  def unmimify(infile, outfile, decode_base64 = 0):
! 	"""Convert quoted-printable parts of a MIME mail message to 8bit."""
  	if type(infile) == type(''):
  		ifile = open(infile)
***************
*** 222,227 ****
  
  def mime_encode(line, header):
! 	'''Code a single line as quoted-printable.
! 	   If header is set, quote some extra characters.'''
  	if header:
  		reg = mime_header_char
--- 221,226 ----
  
  def mime_encode(line, header):
! 	"""Code a single line as quoted-printable.
! 	If header is set, quote some extra characters."""
  	if header:
  		reg = mime_header_char
***************
*** 256,260 ****
  
  def mime_encode_header(line):
! 	'''Code a single header line as quoted-printable.'''
  	newline = ''
  	pos = 0
--- 255,259 ----
  
  def mime_encode_header(line):
! 	"""Code a single header line as quoted-printable."""
  	newline = ''
  	pos = 0
***************
*** 274,278 ****
  
  def mimify_part(ifile, ofile, is_mime):
! 	'''Convert an 8bit part of a MIME mail message to quoted-printable.'''
  	has_cte = is_qp = is_base64 = 0
  	multipart = None
--- 273,277 ----
  
  def mimify_part(ifile, ofile, is_mime):
! 	"""Convert an 8bit part of a MIME mail message to quoted-printable."""
  	has_cte = is_qp = is_base64 = 0
  	multipart = None
***************
*** 409,413 ****
  
  def mimify(infile, outfile):
! 	'''Convert 8bit parts of a MIME mail message to quoted-printable.'''
  	if type(infile) == type(''):
  		ifile = open(infile)
--- 408,412 ----
  
  def mimify(infile, outfile):
! 	"""Convert 8bit parts of a MIME mail message to quoted-printable."""
  	if type(infile) == type(''):
  		ifile = open(infile)

Index: multifile.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/multifile.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** multifile.py	1998/06/29 17:58:43	1.8
--- multifile.py	2000/02/04 15:10:33	1.9
***************
*** 1,28 ****
! # A class that makes each part of a multipart message "feel" like an
! # ordinary file, as long as you use fp.readline().  Allows recursive
! # use, for nested multipart messages.  Probably best used together
! # with module mimetools.
! #
! # Suggested use:
! #
! # real_fp = open(...)
! # fp = MultiFile(real_fp)
! #
! # "read some lines from fp"
! # fp.push(separator)
! # while 1:
! #	"read lines from fp until it returns an empty string" (A)
! #	if not fp.next(): break
! # fp.pop()
! # "read remaining lines from fp until it returns an empty string"
! #
! # The latter sequence may be used recursively at (A).
! # It is also allowed to use multiple push()...pop() sequences.
! #
! # If seekable is given as 0, the class code will not do the bookeeping
! # it normally attempts in order to make seeks relative to the beginning of the
! # current file part.  This may be useful when using MultiFile with a non-
! # seekable stream object.
  
  import sys
  import string
--- 1,31 ----
! """A readline()-style interface to the parts of a multipart message.
  
+ The MultiFile class makes each part of a multipart message "feel" like
+ an ordinary file, as long as you use fp.readline().  Allows recursive
+ use, for nested multipart messages.  Probably best used together
+ with module mimetools.
+ 
+ Suggested use:
+ 
+ real_fp = open(...)
+ fp = MultiFile(real_fp)
+ 
+ "read some lines from fp"
+ fp.push(separator)
+ while 1:
+ 	"read lines from fp until it returns an empty string" (A)
+ 	if not fp.next(): break
+ fp.pop()
+ "read remaining lines from fp until it returns an empty string"
+ 
+ The latter sequence may be used recursively at (A).
+ It is also allowed to use multiple push()...pop() sequences.
+ 
+ If seekable is given as 0, the class code will not do the bookeeping
+ it normally attempts in order to make seeks relative to the beginning of the
+ current file part.  This may be useful when using MultiFile with a non-
+ seekable stream object.
+ """
+ 
  import sys
  import string
***************
*** 31,37 ****
  
  class MultiFile:
! 	#
  	seekable = 0
! 	#
  	def __init__(self, fp, seekable=1):
  		self.fp = fp
--- 34,40 ----
  
  class MultiFile:
! 
  	seekable = 0
! 
  	def __init__(self, fp, seekable=1):
  		self.fp = fp
***************
*** 43,52 ****
  			self.start = self.fp.tell()
  			self.posstack = [] # Grows down
! 	#
  	def tell(self):
  		if self.level > 0:
  			return self.lastpos
  		return self.fp.tell() - self.start
! 	#
  	def seek(self, pos, whence=0):
  		here = self.tell()
--- 46,55 ----
  			self.start = self.fp.tell()
  			self.posstack = [] # Grows down
! 
  	def tell(self):
  		if self.level > 0:
  			return self.lastpos
  		return self.fp.tell() - self.start
! 
  	def seek(self, pos, whence=0):
  		here = self.tell()
***************
*** 65,69 ****
  		self.level = 0
  		self.last = 0
! 	#
  	def readline(self):
  		if self.level > 0:
--- 68,72 ----
  		self.level = 0
  		self.last = 0
! 
  	def readline(self):
  		if self.level > 0:
***************
*** 106,110 ****
  			raise Error,'Missing endmarker in MultiFile.readline()'
  		return ''
! 	#
  	def readlines(self):
  		list = []
--- 109,113 ----
  			raise Error,'Missing endmarker in MultiFile.readline()'
  		return ''
! 
  	def readlines(self):
  		list = []
***************
*** 114,121 ****
  			list.append(line)
  		return list
! 	#
  	def read(self): # Note: no size argument -- read until EOF only!
  		return string.joinfields(self.readlines(), '')
! 	#
  	def next(self):
  		while self.readline(): pass
--- 117,124 ----
  			list.append(line)
  		return list
! 
  	def read(self): # Note: no size argument -- read until EOF only!
  		return string.joinfields(self.readlines(), '')
! 
  	def next(self):
  		while self.readline(): pass
***************
*** 127,131 ****
  			self.start = self.fp.tell()
  		return 1
! 	#
  	def push(self, sep):
  		if self.level > 0:
--- 130,134 ----
  			self.start = self.fp.tell()
  		return 1
! 
  	def push(self, sep):
  		if self.level > 0:
***************
*** 135,139 ****
  			self.posstack.insert(0, self.start)
  			self.start = self.fp.tell()
! 	#
  	def pop(self):
  		if self.stack == []:
--- 138,142 ----
  			self.posstack.insert(0, self.start)
  			self.start = self.fp.tell()
! 
  	def pop(self):
  		if self.stack == []:
***************
*** 150,160 ****
  			if self.level > 0:
  				self.lastpos = abslastpos - self.start
! 	#
  	def is_data(self, line):
  		return line[:2] <> '--'
! 	#
  	def section_divider(self, str):
  		return "--" + str
! 	#
  	def end_marker(self, str):
  		return "--" + str + "--"
--- 153,163 ----
  			if self.level > 0:
  				self.lastpos = abslastpos - self.start
! 
  	def is_data(self, line):
  		return line[:2] <> '--'
! 
  	def section_divider(self, str):
  		return "--" + str
! 
  	def end_marker(self, str):
  		return "--" + str + "--"

Index: mutex.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mutex.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** mutex.py	1996/10/08 14:06:17	1.5
--- mutex.py	2000/02/04 15:10:33	1.6
***************
*** 1,32 ****
! # Mutual exclusion -- for use with module sched
  
! # A mutex has two pieces of state -- a 'locked' bit and a queue.
! # When the mutex is not locked, the queue is empty.
! # Otherwise, the queue contains 0 or more (function, argument) pairs
! # representing functions (or methods) waiting to acquire the lock.
! # When the mutex is unlocked while the queue is not empty,
! # the first queue entry is removed and its function(argument) pair called,
! # implying it now has the lock.
! #
! # Of course, no multi-threading is implied -- hence the funny interface
! # for lock, where a function is called once the lock is aquired.
! #
  class mutex:
- 	#
- 	# Create a new mutex -- initially unlocked
- 	#
  	def __init__(self):
  		self.locked = 0
  		self.queue = []
! 	#
! 	# Test the locked bit of the mutex
! 	#
  	def test(self):
  		return self.locked
! 	#
! 	# Atomic test-and-set -- grab the lock if it is not set,
! 	# return true if it succeeded
! 	#
  	def testandset(self):
  		if not self.locked:
  			self.locked = 1
--- 1,29 ----
! """Mutual exclusion -- for use with module sched
  
! A mutex has two pieces of state -- a 'locked' bit and a queue.
! When the mutex is not locked, the queue is empty.
! Otherwise, the queue contains 0 or more (function, argument) pairs
! representing functions (or methods) waiting to acquire the lock.
! When the mutex is unlocked while the queue is not empty,
! the first queue entry is removed and its function(argument) pair called,
! implying it now has the lock.
! 
! Of course, no multi-threading is implied -- hence the funny interface
! for lock, where a function is called once the lock is aquired.
! """
! 
  class mutex:
  	def __init__(self):
+ 		"""Create a new mutex -- initially unlocked."""
  		self.locked = 0
  		self.queue = []
! 
  	def test(self):
+ 		"""Test the locked bit of the mutex."""
  		return self.locked
! 
  	def testandset(self):
+ 		"""Atomic test-and-set -- grab the lock if it is not set,
+ 		return true if it succeeded."""
  		if not self.locked:
  			self.locked = 1
***************
*** 34,53 ****
  		else:
  			return 0
! 	#
! 	# Lock a mutex, call the function with supplied argument
! 	# when it is acquired.
! 	# If the mutex is already locked, place function and argument
! 	# in the queue.
! 	#
  	def lock(self, function, argument):
  		if self.testandset():
  			function(argument)
  		else:
  			self.queue.append((function, argument))
! 	#
! 	# Unlock a mutex.  If the queue is not empty, call the next
! 	# function with its argument.
! 	#
  	def unlock(self):
  		if self.queue:
  			function, argument = self.queue[0]
--- 31,47 ----
  		else:
  			return 0
! 
  	def lock(self, function, argument):
+ 		"""Lock a mutex, call the function with supplied argument
+ 		when it is acquired.  If the mutex is already locked, place
+ 		function and argument in the queue."""
  		if self.testandset():
  			function(argument)
  		else:
  			self.queue.append((function, argument))
! 
  	def unlock(self):
+ 		"""Unlock a mutex.  If the queue is not empty, call the next
+ 		function with its argument."""
  		if self.queue:
  			function, argument = self.queue[0]
***************
*** 56,58 ****
  		else:
  			self.locked = 0
- 	#
--- 50,51 ----

Index: netrc.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/netrc.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** netrc.py	1999/05/03 18:10:37	1.3
--- netrc.py	2000/02/04 15:10:33	1.4
***************
*** 1,2 ****
--- 1,4 ----
+ """An object-oriented interface to .netrc files."""
+ 
  # Module and documentation by Eric S. Raymond, 21 Dec 1998 
  
***************
*** 64,68 ****
  
      def authenticators(self, host):
!         "Return a (user, account, password) tuple for given host."
          if self.hosts.has_key(host):
              return self.hosts[host]
--- 66,70 ----
  
      def authenticators(self, host):
!         """Return a (user, account, password) tuple for given host."""
          if self.hosts.has_key(host):
              return self.hosts[host]
***************
*** 73,77 ****
  
      def __repr__(self):
!         "Dump the class data in the format of a .netrc file"
          rep = ""
          for host in self.hosts.keys():
--- 75,79 ----
  
      def __repr__(self):
!         """Dump the class data in the format of a .netrc file."""
          rep = ""
          for host in self.hosts.keys():

Index: nntplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/nntplib.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** nntplib.py	1998/12/21 18:51:23	1.16
--- nntplib.py	2000/02/04 15:10:33	1.17
***************
*** 1,30 ****
! # An NNTP client class.  Based on RFC 977: Network News Transfer
! # Protocol, by Brian Kantor and Phil Lapsley.
  
  
! # Example:
! #
! # >>> from nntplib import NNTP
! # >>> s = NNTP('news')
! # >>> resp, count, first, last, name = s.group('comp.lang.python')
! # >>> print 'Group', name, 'has', count, 'articles, range', first, 'to', last
! # Group comp.lang.python has 51 articles, range 5770 to 5821
! # >>> resp, subs = s.xhdr('subject', first + '-' + last)
! # >>> resp = s.quit()
! # >>>
! #
! # Here 'resp' is the server response line.
! # Error responses are turned into exceptions.
! #
! # To post an article from a file:
! # >>> f = open(filename, 'r') # file containing article, including header
! # >>> resp = s.post(f)
! # >>>
! #
! # For descriptions of all methods, read the comments in the code below.
! # Note that all arguments and return values representing article numbers
! # are strings, not numbers, since they are rarely used for calculations.
  
! # (xover, xgtitle, xpath, date methods by Kevan Heydon)
  
  
--- 1,30 ----
! """An NNTP client class based on RFC 977: Network News Transfer Protocol.
  
+ Example:
  
! >>> from nntplib import NNTP
! >>> s = NNTP('news')
! >>> resp, count, first, last, name = s.group('comp.lang.python')
! >>> print 'Group', name, 'has', count, 'articles, range', first, 'to', last
! Group comp.lang.python has 51 articles, range 5770 to 5821
! >>> resp, subs = s.xhdr('subject', first + '-' + last)
! >>> resp = s.quit()
! >>>
! 
! Here 'resp' is the server response line.
! Error responses are turned into exceptions.
! 
! To post an article from a file:
! >>> f = open(filename, 'r') # file containing article, including header
! >>> resp = s.post(f)
! >>>
! 
! For descriptions of all methods, read the comments in the code below.
! Note that all arguments and return values representing article numbers
! are strings, not numbers, since they are rarely used for calculations.
! """
  
! # RFC 977 by Brian Kantor and Phil Lapsley.
! # xover, xgtitle, xpath, date methods by Kevan Heydon
  
  
***************
*** 36,40 ****
  
  # Exception raised when an error or invalid response is received
- 
  error_reply = 'nntplib.error_reply'	# unexpected [123]xx reply
  error_temp = 'nntplib.error_temp'	# 4xx errors
--- 36,39 ----
***************
*** 60,68 ****
  class NNTP:
  
- 	# Initialize an instance.  Arguments:
- 	# - host: hostname to connect to
- 	# - port: port to connect to (default the standard NNTP port)
- 
  	def __init__(self, host, port = NNTP_PORT, user=None, password=None):
  		self.host = host
  		self.port = port
--- 59,67 ----
  class NNTP:
  
  	def __init__(self, host, port = NNTP_PORT, user=None, password=None):
+ 		"""Initialize an instance.  Arguments:
+ 		- host: hostname to connect to
+ 		- port: port to connect to (default the standard NNTP port)"""
+ 
  		self.host = host
  		self.port = port
***************
*** 83,118 ****
  						raise error_perm, resp
  
- 	# Get the welcome message from the server
- 	# (this is read and squirreled away by __init__()).
- 	# If the response code is 200, posting is allowed;
- 	# if it 201, posting is not allowed
- 
  	def getwelcome(self):
  		if self.debugging: print '*welcome*', `self.welcome`
  		return self.welcome
  
- 	# Set the debugging level.  Argument level means:
- 	# 0: no debugging output (default)
- 	# 1: print commands and responses but not body text etc.
- 	# 2: also print raw lines read and sent before stripping CR/LF
- 
  	def set_debuglevel(self, level):
  		self.debugging = level
  	debug = set_debuglevel
  
- 	# Internal: send one line to the server, appending CRLF
  	def putline(self, line):
  		line = line + CRLF
  		if self.debugging > 1: print '*put*', `line`
  		self.sock.send(line)
  
- 	# Internal: send one command to the server (through putline())
  	def putcmd(self, line):
  		if self.debugging: print '*cmd*', `line`
  		self.putline(line)
  
- 	# Internal: return one line from the server, stripping CRLF.
- 	# Raise EOFError if the connection is closed
  	def getline(self):
  		line = self.file.readline()
  		if self.debugging > 1:
--- 82,117 ----
  						raise error_perm, resp
  
  	def getwelcome(self):
+ 		"""Get the welcome message from the server
+ 		(this is read and squirreled away by __init__()).
+ 		If the response code is 200, posting is allowed;
+ 		if it 201, posting is not allowed."""
+ 
  		if self.debugging: print '*welcome*', `self.welcome`
  		return self.welcome
  
  	def set_debuglevel(self, level):
+ 		"""Set the debugging level.  Argument 'level' means:
+ 		0: no debugging output (default)
+ 		1: print commands and responses but not body text etc.
+ 		2: also print raw lines read and sent before stripping CR/LF"""
+ 
  		self.debugging = level
  	debug = set_debuglevel
  
  	def putline(self, line):
+ 		"""Internal: send one line to the server, appending CRLF."""
  		line = line + CRLF
  		if self.debugging > 1: print '*put*', `line`
  		self.sock.send(line)
  
  	def putcmd(self, line):
+ 		"""Internal: send one command to the server (through putline())."""
  		if self.debugging: print '*cmd*', `line`
  		self.putline(line)
  
  	def getline(self):
+ 		"""Internal: return one line from the server, stripping CRLF.
+ 		Raise EOFError if the connection is closed."""
  		line = self.file.readline()
  		if self.debugging > 1:
***************
*** 123,129 ****
  		return line
  
- 	# Internal: get a response from the server.
- 	# Raise various errors if the response indicates an error
  	def getresp(self):
  		resp = self.getline()
  		if self.debugging: print '*resp*', `resp`
--- 122,128 ----
  		return line
  
  	def getresp(self):
+ 		"""Internal: get a response from the server.
+ 		Raise various errors if the response indicates an error."""
  		resp = self.getline()
  		if self.debugging: print '*resp*', `resp`
***************
*** 137,143 ****
  		return resp
  
- 	# Internal: get a response plus following text from the server.
- 	# Raise various errors if the response indicates an error
  	def getlongresp(self):
  		resp = self.getresp()
  		if resp[:3] not in LONGRESP:
--- 136,142 ----
  		return resp
  
  	def getlongresp(self):
+ 		"""Internal: get a response plus following text from the server.
+ 		Raise various errors if the response indicates an error."""
  		resp = self.getresp()
  		if resp[:3] not in LONGRESP:
***************
*** 153,193 ****
  		return resp, list
  
- 	# Internal: send a command and get the response
  	def shortcmd(self, line):
  		self.putcmd(line)
  		return self.getresp()
  
- 	# Internal: send a command and get the response plus following text
  	def longcmd(self, line):
  		self.putcmd(line)
  		return self.getlongresp()
  
- 	# Process a NEWGROUPS command.  Arguments:
- 	# - date: string 'yymmdd' indicating the date
- 	# - time: string 'hhmmss' indicating the time
- 	# Return:
- 	# - resp: server response if succesful
- 	# - list: list of newsgroup names
- 
  	def newgroups(self, date, time):
! 		return self.longcmd('NEWGROUPS ' + date + ' ' + time)
  
! 	# Process a NEWNEWS command.  Arguments:
! 	# - group: group name or '*'
! 	# - date: string 'yymmdd' indicating the date
! 	# - time: string 'hhmmss' indicating the time
! 	# Return:
! 	# - resp: server response if succesful
! 	# - list: list of article ids
  
  	def newnews(self, group, date, time):
  		cmd = 'NEWNEWS ' + group + ' ' + date + ' ' + time
  		return self.longcmd(cmd)
  
- 	# Process a LIST command.  Return:
- 	# - resp: server response if succesful
- 	# - list: list of (group, last, first, flag) (strings)
- 
  	def list(self):
  		resp, list = self.longcmd('LIST')
  		for i in range(len(list)):
--- 152,192 ----
  		return resp, list
  
  	def shortcmd(self, line):
+ 		"""Internal: send a command and get the response."""
  		self.putcmd(line)
  		return self.getresp()
  
  	def longcmd(self, line):
+ 		"""Internal: send a command and get the response plus following text."""
  		self.putcmd(line)
  		return self.getlongresp()
  
  	def newgroups(self, date, time):
! 		"""Process a NEWGROUPS command.  Arguments:
! 		- date: string 'yymmdd' indicating the date
! 		- time: string 'hhmmss' indicating the time
! 		Return:
! 		- resp: server response if succesful
! 		- list: list of newsgroup names"""
  
! 		return self.longcmd('NEWGROUPS ' + date + ' ' + time)
  
  	def newnews(self, group, date, time):
+ 		"""Process a NEWNEWS command.  Arguments:
+ 		- group: group name or '*'
+ 		- date: string 'yymmdd' indicating the date
+ 		- time: string 'hhmmss' indicating the time
+ 		Return:
+ 		- resp: server response if succesful
+ 		- list: list of article ids"""
+ 
  		cmd = 'NEWNEWS ' + group + ' ' + date + ' ' + time
  		return self.longcmd(cmd)
  
  	def list(self):
+ 		"""Process a LIST command.  Return:
+ 		- resp: server response if succesful
+ 		- list: list of (group, last, first, flag) (strings)"""
+ 
  		resp, list = self.longcmd('LIST')
  		for i in range(len(list)):
***************
*** 196,209 ****
  		return resp, list
  
- 	# Process a GROUP command.  Argument:
- 	# - group: the group name
- 	# Returns:
- 	# - resp: server response if succesful
- 	# - count: number of articles (string)
- 	# - first: first article number (string)
- 	# - last: last article number (string)
- 	# - name: the group name
- 
  	def group(self, name):
  		resp = self.shortcmd('GROUP ' + name)
  		if resp[:3] <> '211':
--- 195,208 ----
  		return resp, list
  
  	def group(self, name):
+ 		"""Process a GROUP command.  Argument:
+ 		- group: the group name
+ 		Returns:
+ 		- resp: server response if succesful
+ 		- count: number of articles (string)
+ 		- first: first article number (string)
+ 		- last: last article number (string)
+ 		- name: the group name"""
+ 
  		resp = self.shortcmd('GROUP ' + name)
  		if resp[:3] <> '211':
***************
*** 222,234 ****
  		return resp, count, first, last, name
  
- 	# Process a HELP command.  Returns:
- 	# - resp: server response if succesful
- 	# - list: list of strings
- 
  	def help(self):
  		return self.longcmd('HELP')
  
- 	# Internal: parse the response of a STAT, NEXT or LAST command
  	def statparse(self, resp):
  		if resp[:2] <> '22':
  			raise error_reply, resp
--- 221,233 ----
  		return resp, count, first, last, name
  
  	def help(self):
+ 		"""Process a HELP command.  Returns:
+ 		- resp: server response if succesful
+ 		- list: list of strings"""
+ 
  		return self.longcmd('HELP')
  
  	def statparse(self, resp):
+ 		"""Internal: parse the response of a STAT, NEXT or LAST command."""
  		if resp[:2] <> '22':
  			raise error_reply, resp
***************
*** 243,324 ****
  		return resp, nr, id
  
- 	# Internal: process a STAT, NEXT or LAST command
  	def statcmd(self, line):
  		resp = self.shortcmd(line)
  		return self.statparse(resp)
  
- 	# Process a STAT command.  Argument:
- 	# - id: article number or message id
- 	# Returns:
- 	# - resp: server response if succesful
- 	# - nr:   the article number
- 	# - id:   the article id
- 
  	def stat(self, id):
! 		return self.statcmd('STAT ' + id)
  
! 	# Process a NEXT command.  No arguments.  Return as for STAT
  
  	def next(self):
  		return self.statcmd('NEXT')
  
- 	# Process a LAST command.  No arguments.  Return as for STAT
- 
  	def last(self):
  		return self.statcmd('LAST')
  
- 	# Internal: process a HEAD, BODY or ARTICLE command
  	def artcmd(self, line):
  		resp, list = self.longcmd(line)
  		resp, nr, id = self.statparse(resp)
  		return resp, nr, id, list
  
- 	# Process a HEAD command.  Argument:
- 	# - id: article number or message id
- 	# Returns:
- 	# - resp: server response if succesful
- 	# - nr: article number
- 	# - id: message id
- 	# - list: the lines of the article's header
- 
  	def head(self, id):
! 		return self.artcmd('HEAD ' + id)
  
! 	# Process a BODY command.  Argument:
! 	# - id: article number or message id
! 	# Returns:
! 	# - resp: server response if succesful
! 	# - nr: article number
! 	# - id: message id
! 	# - list: the lines of the article's body
  
  	def body(self, id):
! 		return self.artcmd('BODY ' + id)
  
! 	# Process an ARTICLE command.  Argument:
! 	# - id: article number or message id
! 	# Returns:
! 	# - resp: server response if succesful
! 	# - nr: article number
! 	# - id: message id
! 	# - list: the lines of the article
  
  	def article(self, id):
! 		return self.artcmd('ARTICLE ' + id)
  
! 	# Process a SLAVE command.  Returns:
! 	# - resp: server response if succesful
  
  	def slave(self):
! 		return self.shortcmd('SLAVE')
  
! 	# Process an XHDR command (optional server extension).  Arguments:
! 	# - hdr: the header type (e.g. 'subject')
! 	# - str: an article nr, a message id, or a range nr1-nr2
! 	# Returns:
! 	# - resp: server response if succesful
! 	# - list: list of (nr, value) strings
  
  	def xhdr(self, hdr, str):
  		pat = re.compile('^([0-9]+) ?(.*)\n?')
  		resp, lines = self.longcmd('XHDR ' + hdr + ' ' + str)
--- 242,321 ----
  		return resp, nr, id
  
  	def statcmd(self, line):
+ 		"""Internal: process a STAT, NEXT or LAST command."""
  		resp = self.shortcmd(line)
  		return self.statparse(resp)
  
  	def stat(self, id):
! 		"""Process a STAT command.  Argument:
! 		- id: article number or message id
! 		Returns:
! 		- resp: server response if succesful
! 		- nr:   the article number
! 		- id:   the article id"""
  
! 		return self.statcmd('STAT ' + id)
  
  	def next(self):
+ 		"""Process a NEXT command.  No arguments.  Return as for STAT."""
  		return self.statcmd('NEXT')
  
  	def last(self):
+ 		"""Process a LAST command.  No arguments.  Return as for STAT."""
  		return self.statcmd('LAST')
  
  	def artcmd(self, line):
+ 		"""Internal: process a HEAD, BODY or ARTICLE command."""
  		resp, list = self.longcmd(line)
  		resp, nr, id = self.statparse(resp)
  		return resp, nr, id, list
  
  	def head(self, id):
! 		"""Process a HEAD command.  Argument:
! 		- id: article number or message id
! 		Returns:
! 		- resp: server response if succesful
! 		- nr: article number
! 		- id: message id
! 		- list: the lines of the article's header"""
  
! 		return self.artcmd('HEAD ' + id)
  
  	def body(self, id):
! 		"""Process a BODY command.  Argument:
! 		- id: article number or message id
! 		Returns:
! 		- resp: server response if succesful
! 		- nr: article number
! 		- id: message id
! 		- list: the lines of the article's body"""
  
! 		return self.artcmd('BODY ' + id)
  
  	def article(self, id):
! 		"""Process an ARTICLE command.  Argument:
! 		- id: article number or message id
! 		Returns:
! 		- resp: server response if succesful
! 		- nr: article number
! 		- id: message id
! 		- list: the lines of the article"""
  
! 		return self.artcmd('ARTICLE ' + id)
  
  	def slave(self):
! 		"""Process a SLAVE command.  Returns:
! 		- resp: server response if succesful"""
  
! 		return self.shortcmd('SLAVE')
  
  	def xhdr(self, hdr, str):
+ 		"""Process an XHDR command (optional server extension).  Arguments:
+ 		- hdr: the header type (e.g. 'subject')
+ 		- str: an article nr, a message id, or a range nr1-nr2
+ 		Returns:
+ 		- resp: server response if succesful
+ 		- list: list of (nr, value) strings"""
+ 
  		pat = re.compile('^([0-9]+) ?(.*)\n?')
  		resp, lines = self.longcmd('XHDR ' + hdr + ' ' + str)
***************
*** 330,341 ****
  		return resp, lines
  
- 	# Process an XOVER command (optional server extension) Arguments:
- 	# - start: start of range
- 	# - end: end of range
- 	# Returns:
- 	# - resp: server response if succesful
- 	# - list: list of (art-nr, subject, poster, date, id, refrences, size, lines)
- 
  	def xover(self,start,end):
  		resp, lines = self.longcmd('XOVER ' + start + '-' + end)
  		xover_lines = []
--- 327,339 ----
  		return resp, lines
  
  	def xover(self,start,end):
+ 		"""Process an XOVER command (optional server extension) Arguments:
+ 		- start: start of range
+ 		- end: end of range
+ 		Returns:
+ 		- resp: server response if succesful
+ 		- list: list of (art-nr, subject, poster, date,
+ 		                 id, references, size, lines)"""
+ 
  		resp, lines = self.longcmd('XOVER ' + start + '-' + end)
  		xover_lines = []
***************
*** 355,365 ****
  		return resp,xover_lines
  
- 	# Process an XGTITLE command (optional server extension) Arguments:
- 	# - group: group name wildcard (i.e. news.*)
- 	# Returns:
- 	# - resp: server response if succesful
- 	# - list: list of (name,title) strings
- 
  	def xgtitle(self, group):
  		line_pat = re.compile("^([^ \t]+)[ \t]+(.*)$")
  		resp, raw_lines = self.longcmd('XGTITLE ' + group)
--- 353,363 ----
  		return resp,xover_lines
  
  	def xgtitle(self, group):
+ 		"""Process an XGTITLE command (optional server extension) Arguments:
+ 		- group: group name wildcard (i.e. news.*)
+ 		Returns:
+ 		- resp: server response if succesful
+ 		- list: list of (name,title) strings"""
+ 
  		line_pat = re.compile("^([^ \t]+)[ \t]+(.*)$")
  		resp, raw_lines = self.longcmd('XGTITLE ' + group)
***************
*** 371,381 ****
  		return resp, lines
  
- 	# Process an XPATH command (optional server extension) Arguments:
- 	# - id: Message id of article
- 	# Returns:
- 	# resp: server response if succesful
- 	# path: directory path to article
- 
  	def xpath(self,id):
  		resp = self.shortcmd("XPATH " + id)
  		if resp[:3] <> '223':
--- 369,379 ----
  		return resp, lines
  
  	def xpath(self,id):
+ 		"""Process an XPATH command (optional server extension) Arguments:
+ 		- id: Message id of article
+ 		Returns:
+ 		resp: server response if succesful
+ 		path: directory path to article"""
+ 
  		resp = self.shortcmd("XPATH " + id)
  		if resp[:3] <> '223':
***************
*** 388,399 ****
  			return resp, path
  
- 	# Process the DATE command. Arguments:
- 	# None
- 	# Returns:
- 	# resp: server response if succesful
- 	# date: Date suitable for newnews/newgroups commands etc.
- 	# time: Time suitable for newnews/newgroups commands etc.
- 
  	def date (self):
  		resp = self.shortcmd("DATE")
  		if resp[:3] <> '111':
--- 386,397 ----
  			return resp, path
  
  	def date (self):
+ 		"""Process the DATE command. Arguments:
+ 		None
+ 		Returns:
+ 		resp: server response if succesful
+ 		date: Date suitable for newnews/newgroups commands etc.
+ 		time: Time suitable for newnews/newgroups commands etc."""
+ 
  		resp = self.shortcmd("DATE")
  		if resp[:3] <> '111':
***************
*** 409,418 ****
  
  
- 	# Process a POST command.  Arguments:
- 	# - f: file containing the article
- 	# Returns:
- 	# - resp: server response if succesful
- 
  	def post(self, f):
  		resp = self.shortcmd('POST')
  		# Raises error_??? if posting is not allowed
--- 407,416 ----
  
  
  	def post(self, f):
+ 		"""Process a POST command.  Arguments:
+ 		- f: file containing the article
+ 		Returns:
+ 		- resp: server response if succesful"""
+ 
  		resp = self.shortcmd('POST')
  		# Raises error_??? if posting is not allowed
***************
*** 431,442 ****
  		return self.getresp()
  
- 	# Process an IHAVE command.  Arguments:
- 	# - id: message-id of the article
- 	# - f:  file containing the article
- 	# Returns:
- 	# - resp: server response if succesful
- 	# Note that if the server refuses the article an exception is raised
- 
  	def ihave(self, id, f):
  		resp = self.shortcmd('IHAVE ' + id)
  		# Raises error_??? if the server already has it
--- 429,440 ----
  		return self.getresp()
  
  	def ihave(self, id, f):
+ 		"""Process an IHAVE command.  Arguments:
+ 		- id: message-id of the article
+ 		- f:  file containing the article
+ 		Returns:
+ 		- resp: server response if succesful
+ 		Note that if the server refuses the article an exception is raised."""
+ 
  		resp = self.shortcmd('IHAVE ' + id)
  		# Raises error_??? if the server already has it
***************
*** 455,462 ****
  		return self.getresp()
  
- 	 # Process a QUIT command and close the socket.  Returns:
- 	 # - resp: server response if succesful
- 
  	def quit(self):
  		resp = self.shortcmd('QUIT')
  		self.file.close()
--- 453,460 ----
  		return self.getresp()
  
  	def quit(self):
+ 		"""Process a QUIT command and close the socket.  Returns:
+ 		- resp: server response if succesful"""
+ 
  		resp = self.shortcmd('QUIT')
  		self.file.close()
***************
*** 466,471 ****
  
  
- # Minimal test function
  def _test():
  	s = NNTP('news')
  	resp, count, first, last, name = s.group('comp.lang.python')
--- 464,469 ----
  
  
  def _test():
+ 	"""Minimal test function."""
  	s = NNTP('news')
  	resp, count, first, last, name = s.group('comp.lang.python')

Index: nturl2path.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/nturl2path.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** nturl2path.py	1999/03/18 14:21:41	1.4
--- nturl2path.py	2000/02/04 15:10:33	1.5
***************
*** 1,5 ****
! #
! # nturl2path convert a NT pathname to a file URL and 
! # vice versa  
  
  def url2pathname(url):
--- 1,3 ----
! """Convert a NT pathname to a file URL and vice versa."""
  
  def url2pathname(url):
***************
*** 35,39 ****
  
  def pathname2url(p):
- 
  	""" Convert a DOS path name to a file url...
  		C:\foo\bar\spam.foo
--- 33,36 ----

Index: os.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/os.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** os.py	1999/11/02 20:44:07	1.28
--- os.py	2000/02/04 15:10:33	1.29
***************
*** 1,20 ****
! # os.py -- either mac, dos or posix depending on what system we're on.
  
! # This exports:
! # - all functions from either posix or mac, e.g., os.unlink, os.stat, etc.
! # - os.path is either module posixpath or macpath
! # - os.name is either 'posix' or 'mac'
! # - os.curdir is a string representing the current directory ('.' or ':')
! # - os.pardir is a string representing the parent directory ('..' or '::')
! # - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\')
! # - os.altsep is the alternatte pathname separator (None or '/')
! # - os.pathsep is the component separator used in $PATH etc
! # - os.defpath is the default search path for executables
  
! # Programs that import and use 'os' stand a better chance of being
! # portable between different platforms.  Of course, they must then
! # only use functions that are defined by all platforms (e.g., unlink
! # and opendir), and leave all pathname manipulation to os.path
! # (e.g., split and join).
  
  import sys
--- 1,21 ----
! """os.py -- either mac, dos or posix depending on what system we're on.
  
! This exports:
!   - all functions from either posix or mac, e.g., os.unlink, os.stat, etc.
!   - os.path is either module posixpath or macpath
!   - os.name is either 'posix' or 'mac'
!   - os.curdir is a string representing the current directory ('.' or ':')
!   - os.pardir is a string representing the parent directory ('..' or '::')
!   - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\')
!   - os.altsep is the alternatte pathname separator (None or '/')
!   - os.pathsep is the component separator used in $PATH etc
!   - os.defpath is the default search path for executables
  
! Programs that import and use 'os' stand a better chance of being
! portable between different platforms.  Of course, they must then
! only use functions that are defined by all platforms (e.g., unlink
! and opendir), and leave all pathname manipulation to os.path
! (e.g., split and join).
! """
  
  import sys

Index: pdb.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pdb.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** pdb.py	1999/11/03 13:10:07	1.40
--- pdb.py	2000/02/04 15:10:33	1.41
***************
*** 1,5 ****
  #! /usr/bin/env python
  
! # pdb.py -- finally, a Python debugger!
  
  # (See pdb.doc for documentation.)
--- 1,5 ----
  #! /usr/bin/env python
  
! """pdb.py -- finally, a Python debugger!"""
  
  # (See pdb.doc for documentation.)
***************
*** 107,115 ****
  	
  	def user_line(self, frame):
! 		# This function is called when we stop or break at this line
  		self.interaction(frame, None)
  	
  	def user_return(self, frame, return_value):
! 		# This function is called when a return trap is set here
  		frame.f_locals['__return__'] = return_value
  		print '--Return--'
--- 107,115 ----
  	
  	def user_line(self, frame):
! 		"""This function is called when we stop or break at this line."""
  		self.interaction(frame, None)
  	
  	def user_return(self, frame, return_value):
! 		"""This function is called when a return trap is set here."""
  		frame.f_locals['__return__'] = return_value
  		print '--Return--'
***************
*** 117,122 ****
  	
  	def user_exception(self, frame, (exc_type, exc_value, exc_traceback)):
! 		# This function is called if an exception occurs,
! 		# but only if we are to stop at or just below this level
  		frame.f_locals['__exception__'] = exc_type, exc_value
  		if type(exc_type) == type(''):
--- 117,122 ----
  	
  	def user_exception(self, frame, (exc_type, exc_value, exc_traceback)):
! 		"""This function is called if an exception occurs,
! 		but only if we are to stop at or just below this level."""
  		frame.f_locals['__exception__'] = exc_type, exc_value
  		if type(exc_type) == type(''):
***************
*** 149,153 ****
  
  	def precmd(self, line):
! 		# Handle alias expansion and ';;' separator
  		if not line:
  			return line
--- 149,153 ----
  
  	def precmd(self, line):
! 		"""Handle alias expansion and ';;' separator."""
  		if not line:
  			return line
***************
*** 263,267 ****
  	# To be overridden in derived debuggers
  	def defaultFile(self):
! 		# Produce a reasonable default
  		filename = self.curframe.f_code.co_filename
  		if filename == '<string>' and mainpyfile:
--- 263,267 ----
  	# To be overridden in derived debuggers
  	def defaultFile(self):
! 		"""Produce a reasonable default."""
  		filename = self.curframe.f_code.co_filename
  		if filename == '<string>' and mainpyfile:
***************
*** 385,389 ****
  
  	def do_ignore(self,arg):
! 		# arg is bp number followed by ignore count
  		args = string.split(arg)
  		bpnum = int(string.strip(args[0]))
--- 385,389 ----
  
  	def do_ignore(self,arg):
! 		"""arg is bp number followed by ignore count."""
  		args = string.split(arg)
  		bpnum = int(string.strip(args[0]))
***************
*** 407,414 ****
  
  	def do_clear(self, arg):
! 		# Three possibilities, tried in this order:
! 		# clear -> clear all breaks, ask for confirmation
! 		# clear file:lineno -> clear all breaks at file:lineno
! 		# clear bpno bpno ... -> clear breakpoints by number
  		if not arg:
  			try:
--- 407,414 ----
  
  	def do_clear(self, arg):
! 		"""Three possibilities, tried in this order:
! 		clear -> clear all breaks, ask for confirmation
! 		clear file:lineno -> clear all breaks at file:lineno
! 		clear bpno bpno ... -> clear breakpoints by number"""
  		if not arg:
  			try:
***************
*** 852,858 ****
  		help()
  
- 	# Helper function for break/clear parsing -- may be overridden
- 
  	def lookupmodule(self, filename):
  		root, ext = os.path.splitext(filename)
  		if ext == '':
--- 852,857 ----
  		help()
  
  	def lookupmodule(self, filename):
+ 		"""Helper function for break/clear parsing -- may be overridden."""
  		root, ext = os.path.splitext(filename)
  		if ext == '':

Index: pickle.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pickle.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** pickle.py	1999/10/10 21:14:25	1.35
--- pickle.py	2000/02/04 15:10:33	1.36
***************
*** 1,3 ****
! """create portable serialized representations of Python objects.
  
  See module cPickle for a (much) faster implementation.
--- 1,3 ----
! """Create portable serialized representations of Python objects.
  
  See module cPickle for a (much) faster implementation.
***************
*** 24,28 ****
  """
  
! __version__ = "$Revision: 1.35 $"       # Code version
  
  from types import *
--- 24,28 ----
  """
  
! __version__ = "$Revision: 1.36 $"       # Code version
  
  from types import *

Index: pipes.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pipes.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pipes.py	1999/05/03 18:12:36	1.4
--- pipes.py	2000/02/04 15:10:34	1.5
***************
*** 1,64 ****
! # Conversion pipeline templates
! # =============================
  
  
! # The problem:
! # ------------
! # 
! # Suppose you have some data that you want to convert to another format
! # (e.g. from GIF image format to PPM image format).  Maybe the
! # conversion involves several steps (e.g. piping it through compress or
! # uuencode).  Some of the conversion steps may require that their input
! # is a disk file, others may be able to read standard input; similar for
! # their output.  The input to the entire conversion may also be read
! # from a disk file or from an open file, and similar for its output.
! # 
! # The module lets you construct a pipeline template by sticking one or
! # more conversion steps together.  It will take care of creating and
! # removing temporary files if they are necessary to hold intermediate
! # data.  You can then use the template to do conversions from many
! # different sources to many different destinations.  The temporary
! # file names used are different each time the template is used.
! #
! # The templates are objects so you can create templates for many
! # different conversion steps and store them in a dictionary, for
! # instance.
! 
! 
! # Directions:
! # -----------
! #
! # To create a template:
! #   t = Template()
! #
! # To add a conversion step to a template:
! #   t.append(command, kind)
! # where kind is a string of two characters: the first is '-' if the
! # command reads its standard input or 'f' if it requires a file; the
! # second likewise for the output. The command must be valid /bin/sh
! # syntax.  If input or output files are required, they are passed as
! # $IN and $OUT; otherwise, it must be  possible to use the command in
! # a pipeline.
! #
! # To add a conversion step at the beginning:
! #   t.prepend(command, kind)
! #
! # To convert a file to another file using a template:
! #   sts = t.copy(infile, outfile)
! # If infile or outfile are the empty string, standard input is read or
! # standard output is written, respectively.  The return value is the
! # exit status of the conversion pipeline.
! # 
! # To open a file for reading or writing through a conversion pipeline:
! #   fp = t.open(file, mode)
! # where mode is 'r' to read the file, or 'w' to write it -- just like
! # for the built-in function open() or for os.popen().
! #
! # To create a new template object initialized to a given one:
! #   t2 = t.clone()
! #
! # For an example, see the function test() at the end of the file.
  
  
  import sys
  import re
--- 1,63 ----
! """Conversion pipeline templates.
  
+ The problem:
+ ------------
  
! Suppose you have some data that you want to convert to another format
! (e.g. from GIF image format to PPM image format).  Maybe the
! conversion involves several steps (e.g. piping it through compress or
! uuencode).  Some of the conversion steps may require that their input
! is a disk file, others may be able to read standard input; similar for
! their output.  The input to the entire conversion may also be read
! from a disk file or from an open file, and similar for its output.
! 
! The module lets you construct a pipeline template by sticking one or
! more conversion steps together.  It will take care of creating and
! removing temporary files if they are necessary to hold intermediate
! data.  You can then use the template to do conversions from many
! different sources to many different destinations.  The temporary
! file names used are different each time the template is used.
! 
! The templates are objects so you can create templates for many
! different conversion steps and store them in a dictionary, for
! instance.
! 
! 
! Directions:
! -----------
! 
! To create a template:
!     t = Template()
! 
! To add a conversion step to a template:
!    t.append(command, kind)
! where kind is a string of two characters: the first is '-' if the
! command reads its standard input or 'f' if it requires a file; the
! second likewise for the output. The command must be valid /bin/sh
! syntax.  If input or output files are required, they are passed as
! $IN and $OUT; otherwise, it must be  possible to use the command in
! a pipeline.
! 
! To add a conversion step at the beginning:
!    t.prepend(command, kind)
! 
! To convert a file to another file using a template:
!   sts = t.copy(infile, outfile)
! If infile or outfile are the empty string, standard input is read or
! standard output is written, respectively.  The return value is the
! exit status of the conversion pipeline.
! 
! To open a file for reading or writing through a conversion pipeline:
!    fp = t.open(file, mode)
! where mode is 'r' to read the file, or 'w' to write it -- just like
! for the built-in function open() or for os.popen().
  
+ To create a new template object initialized to a given one:
+    t2 = t.clone()
  
+ For an example, see the function test() at the end of the file.
+ """
+ 
+ 
  import sys
  import re
***************
*** 82,105 ****
  
  
- # A pipeline template is a Template object:
- 
  class Template:
  
- 	# Template() returns a fresh pipeline template
  	def __init__(self):
  		self.debugging = 0
  		self.reset()
  
- 	# t.__repr__() implements `t`
  	def __repr__(self):
  		return '<Template instance, steps=' + `self.steps` + '>'
  
- 	# t.reset() restores a pipeline template to its initial state
  	def reset(self):
  		self.steps = []
  
- 	# t.clone() returns a new pipeline template with identical
- 	# initial state as the current one
  	def clone(self):
  		t = Template()
  		t.steps = self.steps[:]
--- 81,103 ----
  
  
  class Template:
+ 	"""Class representing a pipeline template."""
  
  	def __init__(self):
+ 		"""Template() returns a fresh pipeline template."""
  		self.debugging = 0
  		self.reset()
  
  	def __repr__(self):
+ 		"""t.__repr__() implements `t`."""
  		return '<Template instance, steps=' + `self.steps` + '>'
  
  	def reset(self):
+ 		"""t.reset() restores a pipeline template to its initial state."""
  		self.steps = []
  
  	def clone(self):
+ 		"""t.clone() returns a new pipeline template with identical
+ 		initial state as the current one."""
  		t = Template()
  		t.steps = self.steps[:]
***************
*** 107,116 ****
  		return t
  
- 	# t.debug(flag) turns debugging on or off
  	def debug(self, flag):
  		self.debugging = flag
  
- 	# t.append(cmd, kind) adds a new step at the end
  	def append(self, cmd, kind):
  		if type(cmd) <> type(''):
  			raise TypeError, \
--- 105,114 ----
  		return t
  
  	def debug(self, flag):
+ 		"""t.debug(flag) turns debugging on or off."""
  		self.debugging = flag
  
  	def append(self, cmd, kind):
+ 		"""t.append(cmd, kind) adds a new step at the end."""
  		if type(cmd) <> type(''):
  			raise TypeError, \
***************
*** 133,138 ****
  		self.steps.append((cmd, kind))
  
- 	# t.prepend(cmd, kind) adds a new step at the front
  	def prepend(self, cmd, kind):
  		if type(cmd) <> type(''):
  			raise TypeError, \
--- 131,136 ----
  		self.steps.append((cmd, kind))
  
  	def prepend(self, cmd, kind):
+ 		"""t.prepend(cmd, kind) adds a new step at the front."""
  		if type(cmd) <> type(''):
  			raise TypeError, \
***************
*** 155,161 ****
  		self.steps.insert(0, (cmd, kind))
  
- 	# t.open(file, rw) returns a pipe or file object open for
- 	# reading or writing; the file is the other end of the pipeline
  	def open(self, file, rw):
  		if rw == 'r':
  			return self.open_r(file)
--- 153,159 ----
  		self.steps.insert(0, (cmd, kind))
  
  	def open(self, file, rw):
+ 		"""t.open(file, rw) returns a pipe or file object open for
+ 		reading or writing; the file is the other end of the pipeline."""
  		if rw == 'r':
  			return self.open_r(file)
***************
*** 165,172 ****
  		      'Template.open: rw must be \'r\' or \'w\', not ' + `rw`
  
- 	# t.open_r(file) and t.open_w(file) implement
- 	# t.open(file, 'r') and t.open(file, 'w') respectively
- 
  	def open_r(self, file):
  		if self.steps == []:
  			return open(file, 'r')
--- 163,169 ----
  		      'Template.open: rw must be \'r\' or \'w\', not ' + `rw`
  
  	def open_r(self, file):
+ 		"""t.open_r(file) and t.open_w(file) implement
+ 		t.open(file, 'r') and t.open(file, 'w') respectively."""
  		if self.steps == []:
  			return open(file, 'r')

Index: popen2.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/popen2.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** popen2.py	1999/04/20 12:27:31	1.8
--- popen2.py	2000/02/04 15:10:34	1.9
***************
*** 1,2 ****
--- 1,10 ----
+ """Spawn a command with pipes to its stdin, stdout, and optionally stderr.
+ 
+ The normal os.popen(cmd, mode) call spawns a shell command and provides a
+ file interface to just the input or output of the process depending on
+ whether mode is 'r' or 'w'.  This module provides the functions popen2(cmd)
+ and popen3(cmd) which return two or three pipes to the spawned command.
+ """
+ 
  import os
  import sys
***************
*** 12,16 ****
--- 20,32 ----
  
  class Popen3:
+     """Class representing a child process.  Normally instances are created
+     by the factory functions popen2() and popen3()."""
+ 
      def __init__(self, cmd, capturestderr=0, bufsize=-1):
+         """The parameter 'cmd' is the shell command to execute in a
+         sub-process.  The 'capturestderr' flag, if true, specifies that
+         the object should capture standard error output of the child process.
+         The default is false.  If the 'bufsize' parameter is specified, it
+         specifies the size of the I/O buffers to/from the child process."""
          if type(cmd) == type(''):
              cmd = ['/bin/sh', '-c', cmd]
***************
*** 52,56 ****
--- 68,75 ----
          self.sts = -1 # Child not completed yet
          _active.append(self)
+ 
      def poll(self):
+         """Return the exit status of the child process if it has finished,
+         or -1 if it hasn't finished yet."""
          if self.sts < 0:
              try:
***************
*** 62,66 ****
--- 81,87 ----
                  pass
          return self.sts
+ 
      def wait(self):
+         """Wait for and return the exit status of the child process."""
          pid, sts = os.waitpid(self.pid, 0)
          if pid == self.pid:
***************
*** 70,73 ****
--- 91,97 ----
  
  def popen2(cmd, bufsize=-1):
+     """Execute the shell command 'cmd' in a sub-process.  If 'bufsize' is
+     specified, it sets the buffer size for the I/O pipes.  The file objects
+     (child_stdout, child_stdin) are returned."""
      _cleanup()
      inst = Popen3(cmd, 0, bufsize)
***************
*** 75,78 ****
--- 99,105 ----
  
  def popen3(cmd, bufsize=-1):
+     """Execute the shell command 'cmd' in a sub-process.  If 'bufsize' is
+     specified, it sets the buffer size for the I/O pipes.  The file objects
+     (child_stdout, child_stdin, child_stderr) are returned."""
      _cleanup()
      inst = Popen3(cmd, 1, bufsize)

Index: posixfile.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/posixfile.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** posixfile.py	1999/12/06 14:51:05	1.12
--- posixfile.py	2000/02/04 15:10:34	1.13
***************
*** 1,63 ****
! #
! # Start of posixfile.py
! #
! 
! #
! # Extended file operations
! #
! # f = posixfile.open(filename, [mode, [bufsize]])
! #       will create a new posixfile object
! #
! # f = posixfile.fileopen(fileobject)
! #       will create a posixfile object from a builtin file object
! #
! # f.file()
! #       will return the original builtin file object
! #
! # f.dup()
! #       will return a new file object based on a new filedescriptor
! #
! # f.dup2(fd)
! #       will return a new file object based on the given filedescriptor
! #
! # f.flags(mode)
! #       will turn on the associated flag (merge)
! #       mode can contain the following characters:
! #
! #   (character representing a flag)
! #       a       append only flag
! #       c       close on exec flag
! #       n       no delay flag
! #       s       synchronization flag
! #   (modifiers)
! #       !       turn flags 'off' instead of default 'on'
! #       =       copy flags 'as is' instead of default 'merge'
! #       ?       return a string in which the characters represent the flags
! #               that are set
! #
! #       note: - the '!' and '=' modifiers are mutually exclusive.
! #             - the '?' modifier will return the status of the flags after they
! #               have been changed by other characters in the mode string
! #
! # f.lock(mode [, len [, start [, whence]]])
! #       will (un)lock a region
! #       mode can contain the following characters:
! #
! #   (character representing type of lock)
! #       u       unlock
! #       r       read lock
! #       w       write lock
! #   (modifiers)
! #       |       wait until the lock can be granted
! #       ?       return the first lock conflicting with the requested lock
! #               or 'None' if there is no conflict. The lock returned is in the
! #               format (mode, len, start, whence, pid) where mode is a
! #               character representing the type of lock ('r' or 'w')
! #
! #       note: - the '?' modifier prevents a region from being locked; it is
! #               query only
! #
  
  class _posixfile_:
      states = ['open', 'closed']
  
--- 1,60 ----
! """Extended file operations available in POSIX.
  
+ f = posixfile.open(filename, [mode, [bufsize]])
+       will create a new posixfile object
+ 
+ f = posixfile.fileopen(fileobject)
+       will create a posixfile object from a builtin file object
+ 
+ f.file()
+       will return the original builtin file object
+ 
+ f.dup()
+       will return a new file object based on a new filedescriptor
+ 
+ f.dup2(fd)
+       will return a new file object based on the given filedescriptor
+ 
+ f.flags(mode)
+       will turn on the associated flag (merge)
+       mode can contain the following characters:
+ 
+   (character representing a flag)
+       a       append only flag
+       c       close on exec flag
+       n       no delay flag
+       s       synchronization flag
+   (modifiers)
+       !       turn flags 'off' instead of default 'on'
+       =       copy flags 'as is' instead of default 'merge'
+       ?       return a string in which the characters represent the flags
+               that are set
+ 
+       note: - the '!' and '=' modifiers are mutually exclusive.
+             - the '?' modifier will return the status of the flags after they
+               have been changed by other characters in the mode string
+ 
+ f.lock(mode [, len [, start [, whence]]])
+       will (un)lock a region
+       mode can contain the following characters:
+ 
+   (character representing type of lock)
+       u       unlock
+       r       read lock
+       w       write lock
+   (modifiers)
+       |       wait until the lock can be granted
+       ?       return the first lock conflicting with the requested lock
+               or 'None' if there is no conflict. The lock returned is in the
+               format (mode, len, start, whence, pid) where mode is a
+               character representing the type of lock ('r' or 'w')
+ 
+       note: - the '?' modifier prevents a region from being locked; it is
+               query only
+ """
+ 
  class _posixfile_:
+     """File wrapper class that provides extra POSIX file routines."""
+ 
      states = ['open', 'closed']
  
***************
*** 216,226 ****
                      return 'w', l_len, l_start, l_whence, l_pid
  
- #
- # Public routine to obtain a posixfile object
- #
  def open(name, mode='r', bufsize=-1):
      return _posixfile_().open(name, mode, bufsize)
  
  def fileopen(file):
      return _posixfile_().fileopen(file)
  
--- 213,222 ----
                      return 'w', l_len, l_start, l_whence, l_pid
  
  def open(name, mode='r', bufsize=-1):
+     """Public routine to open a file as a posixfile object."""
      return _posixfile_().open(name, mode, bufsize)
  
  def fileopen(file):
+     """Public routine to get a posixfile object from a Python file object."""
      return _posixfile_().fileopen(file)
  

Index: posixpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/posixpath.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** posixpath.py	1999/11/02 13:28:19	1.26
--- posixpath.py	2000/02/04 15:10:34	1.27
***************
*** 1,12 ****
! # Module 'posixpath' -- common operations on Posix pathnames.
! # Some of this can actually be useful on non-Posix systems too, e.g.
! # for manipulation of the pathname component of URLs.
! # The "os.path" name is an alias for this module on Posix systems;
! # on other systems (e.g. Mac, Windows), os.path provides the same
! # operations in a manner specific to that platform, and is an alias
! # to another module (e.g. macpath, ntpath).
! """Common pathname manipulations, Posix version. 
! Instead of importing this module
! directly, import os and refer to this module as os.path.
  """
  
--- 1,12 ----
! """Common operations on Posix pathnames.
! 
! Instead of importing this module directly, import os and refer to
! this module as os.path.  The "os.path" name is an alias for this
! module on Posix systems; on other systems (e.g. Mac, Windows),
! os.path provides the same operations in a manner specific to that
! platform, and is an alias to another module (e.g. macpath, ntpath).
! 
! Some of this can actually be useful on non-Posix systems too, e.g.
! for manipulation of the pathname component of URLs.
  """
  
***************
*** 370,375 ****
  
  
- # Return an absolute path.
  def abspath(path):
      if not isabs(path):
          path = join(os.getcwd(), path)
--- 370,375 ----
  
  
  def abspath(path):
+     """Return an absolute path."""
      if not isabs(path):
          path = join(os.getcwd(), path)

Index: profile.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/profile.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** profile.py	1999/05/03 18:13:29	1.21
--- profile.py	2000/02/04 15:10:34	1.22
***************
*** 8,11 ****
--- 8,12 ----
  # See profile.doc for more information
  
+ """Class for profiling Python code."""
  
  # Copyright 1994, by InfoSeek Corporation, all rights reserved.
***************
*** 80,121 ****
  
  
- #**************************************************************************
- # class Profile documentation:
- #**************************************************************************
- # self.cur is always a tuple.  Each such tuple corresponds to a stack
- # frame that is currently active (self.cur[-2]).  The following are the
- # definitions of its members.  We use this external "parallel stack" to
- # avoid contaminating the program that we are profiling. (old profiler
- # used to write into the frames local dictionary!!) Derived classes
- # can change the definition of some entries, as long as they leave
- # [-2:] intact.
- #
- # [ 0] = Time that needs to be charged to the parent frame's function.  It is
- #        used so that a function call will not have to access the timing data
- #        for the parents frame.
- # [ 1] = Total time spent in this frame's function, excluding time in
- #        subfunctions
- # [ 2] = Cumulative time spent in this frame's function, including time in
- #        all subfunctions to this frame.
- # [-3] = Name of the function that corresonds to this frame.  
- # [-2] = Actual frame that we correspond to (used to sync exception handling)
- # [-1] = Our parent 6-tuple (corresonds to frame.f_back)
- #**************************************************************************
- # Timing data for each function is stored as a 5-tuple in the dictionary
- # self.timings[].  The index is always the name stored in self.cur[4].
- # The following are the definitions of the members:
- #
- # [0] = The number of times this function was called, not counting direct
- #       or indirect recursion,
- # [1] = Number of times this function appears on the stack, minus one
- # [2] = Total time spent internal to this function
- # [3] = Cumulative time that this function was present on the stack.  In
- #       non-recursive functions, this is the total execution time from start
- #       to finish of each invocation of a function, including time spent in
- #       all subfunctions.
- # [5] = A dictionary indicating for each function name, the number of times
- #       it was called by us.
- #**************************************************************************
  class Profile:
  
  	def __init__(self, timer=None):
--- 81,121 ----
  
  
  class Profile:
+ 	"""Profiler class.
+ 	
+ 	self.cur is always a tuple.  Each such tuple corresponds to a stack
+ 	frame that is currently active (self.cur[-2]).  The following are the
+ 	definitions of its members.  We use this external "parallel stack" to
+ 	avoid contaminating the program that we are profiling. (old profiler
+ 	used to write into the frames local dictionary!!) Derived classes
+ 	can change the definition of some entries, as long as they leave
+ 	[-2:] intact.
+ 
+ 	[ 0] = Time that needs to be charged to the parent frame's function.
+ 	       It is used so that a function call will not have to access the
+ 	       timing data for the parent frame.
+ 	[ 1] = Total time spent in this frame's function, excluding time in
+ 	       subfunctions
+ 	[ 2] = Cumulative time spent in this frame's function, including time in
+ 	       all subfunctions to this frame.
+ 	[-3] = Name of the function that corresonds to this frame.  
+ 	[-2] = Actual frame that we correspond to (used to sync exception handling)
+ 	[-1] = Our parent 6-tuple (corresonds to frame.f_back)
+ 
+ 	Timing data for each function is stored as a 5-tuple in the dictionary
+ 	self.timings[].  The index is always the name stored in self.cur[4].
+ 	The following are the definitions of the members:
+ 
+ 	[0] = The number of times this function was called, not counting direct
+ 	      or indirect recursion,
+ 	[1] = Number of times this function appears on the stack, minus one
+ 	[2] = Total time spent internal to this function
+ 	[3] = Cumulative time that this function was present on the stack.  In
+ 	      non-recursive functions, this is the total execution time from start
+ 	      to finish of each invocation of a function, including time spent in
+ 	      all subfunctions.
+ 	[5] = A dictionary indicating for each function name, the number of times
+ 	      it was called by us.
+ 	"""
  
  	def __init__(self, timer=None):
***************
*** 450,466 ****
  
  
- #****************************************************************************
- # OldProfile class documentation
- #****************************************************************************
- #
- # The following derived profiler simulates the old style profile, providing
- # errant results on recursive functions. The reason for the usefulnes of this
- # profiler is that it runs faster (i.e., less overhead).  It still creates
- # all the caller stats, and is quite useful when there is *no* recursion
- # in the user's code.
- #
- # This code also shows how easy it is to create a modified profiler.
- #****************************************************************************
  class OldProfile(Profile):
  	def trace_dispatch_exception(self, frame, t):
  		rt, rtt, rct, rfn, rframe, rcur = self.cur
--- 450,463 ----
  
  
  class OldProfile(Profile):
+ 	"""A derived profiler that simulates the old style profile, providing
+ 	errant results on recursive functions. The reason for the usefulness of
+ 	this profiler is that it runs faster (i.e., less overhead).  It still
+ 	creates all the caller stats, and is quite useful when there is *no*
+ 	recursion in the user's code.
+ 	
+ 	This code also shows how easy it is to create a modified profiler.
+ 	"""
+ 
  	def trace_dispatch_exception(self, frame, t):
  		rt, rtt, rct, rfn, rframe, rcur = self.cur
***************
*** 510,523 ****
  		
  
- #****************************************************************************
- # HotProfile class documentation
- #****************************************************************************
- #
- # This profiler is the fastest derived profile example.  It does not
- # calculate caller-callee relationships, and does not calculate cumulative
- # time under a function.  It only calculates time spent in a function, so
- # it runs very quickly (re: very low overhead)
- #****************************************************************************
  class HotProfile(Profile):
  	def trace_dispatch_exception(self, frame, t):
  		rt, rtt, rfn, rframe, rcur = self.cur
--- 507,517 ----
  		
  
  class HotProfile(Profile):
+ 	"""The fastest derived profile example.  It does not calculate
+ 	caller-callee relationships, and does not calculate cumulative
+ 	time under a function.  It only calculates time spent in a
+ 	function, so it runs very quickly due to its very low overhead.
+ 	"""
+ 
  	def trace_dispatch_exception(self, frame, t):
  		rt, rtt, rfn, rframe, rcur = self.cur

Index: pstats.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pstats.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pstats.py	1999/04/13 04:24:22	1.6
--- pstats.py	2000/02/04 15:10:34	1.7
***************
*** 1,3 ****
! #
  # Class for printing reports on profiled python code. rev 1.0  4/1/94
  #
--- 1,4 ----
! """Class for printing reports on profiled python code."""
! 
  # Class for printing reports on profiled python code. rev 1.0  4/1/94
  #
***************
*** 38,76 ****
  import re
  
- #**************************************************************************
- # Class Stats documentation
- #**************************************************************************
- # This class is used for creating reports from data generated by the
- # Profile class.  It is a "friend" of that class, and imports data either
- # by direct access to members of Profile class, or by reading in a dictionary
- # that was emitted (via marshal) from the Profile class.
- #
- # The big change from the previous Profiler (in terms of raw functionality)
- # is that an "add()" method has been provided to combine Stats from
- # several distinct profile runs.  Both the constructor and the add()
- # method now take arbitrarilly many file names as arguments.
- #
- # All the print methods now take an argument that indicats how many lines
- # to print.  If the arg is a floating point number between 0 and 1.0, then
- # it is taken as a decimal percentage of the availabel lines to be printed
- # (e.g., .1 means print 10% of all available lines).  If it is an integer,
- # it is taken to mean the number of lines of data that you wish to have
- # printed.
- #
- # The sort_stats() method now processes some additionaly options (i.e., in
- # addition to the old -1, 0, 1, or 2).  It takes an arbitrary number of quoted
- # strings to select the sort order.  For example sort_stats('time', 'name')
- # sorts on the major key of "internal function time", and on the minor
- # key of 'the name of the function'.  Look at the two tables in sort_stats()
- # and get_sort_arg_defs(self) for more examples.
- #
- # All methods now return "self",  so you can string together commands like:
- #    Stats('foo', 'goo').strip_dirs().sort_stats('calls').\
- #                               print_stats(5).print_callers(5)
- # 
- #**************************************************************************
  import fpformat
  
  class Stats:
  	def __init__(self, *args):
  		if not len(args):
--- 39,74 ----
  import re
  
  import fpformat
  
  class Stats:
+ 	"""This class is used for creating reports from data generated by the
+ 	Profile class.  It is a "friend" of that class, and imports data either
+ 	by direct access to members of Profile class, or by reading in a dictionary
+ 	that was emitted (via marshal) from the Profile class.
+ 
+ 	The big change from the previous Profiler (in terms of raw functionality)
+ 	is that an "add()" method has been provided to combine Stats from
+ 	several distinct profile runs.  Both the constructor and the add()
+ 	method now take arbitrarilly many file names as arguments.
+ 
+ 	All the print methods now take an argument that indicats how many lines
+ 	to print.  If the arg is a floating point number between 0 and 1.0, then
+ 	it is taken as a decimal percentage of the availabel lines to be printed
+ 	(e.g., .1 means print 10% of all available lines).  If it is an integer,
+ 	it is taken to mean the number of lines of data that you wish to have
+ 	printed.
+ 
+ 	The sort_stats() method now processes some additionaly options (i.e., in
+ 	addition to the old -1, 0, 1, or 2).  It takes an arbitrary number of quoted
+ 	strings to select the sort order.  For example sort_stats('time', 'name')
+ 	sorts on the major key of "internal function time", and on the minor
+ 	key of 'the name of the function'.  Look at the two tables in sort_stats()
+ 	and get_sort_arg_defs(self) for more examples.
+ 
+ 	All methods now return "self",  so you can string together commands like:
+ 	    Stats('foo', 'goo').strip_dirs().sort_stats('calls').\
+ 	                        print_stats(5).print_callers(5)
+ 	"""
+ 	
  	def __init__(self, *args):
  		if not len(args):
***************
*** 183,188 ****
  		  }
  
- 	# Expand all abbreviations that are unique
  	def get_sort_arg_defs(self):
  		if not self.sort_arg_dict:
  			self.sort_arg_dict = dict = {}
--- 181,186 ----
  		  }
  
  	def get_sort_arg_defs(self):
+ 		"""Expand all abbreviations that are unique."""
  		if not self.sort_arg_dict:
  			self.sort_arg_dict = dict = {}
***************
*** 290,296 ****
  		return
  
!         #******************************************************************
  	# The following functions support actual printing of reports
!         #******************************************************************
  
  	# Optional "amount" is either a line count, or a percentage of lines.
--- 288,294 ----
  		return
  
! 	#******************************************************************
  	# The following functions support actual printing of reports
! 	#******************************************************************
  
  	# Optional "amount" is either a line count, or a percentage of lines.
***************
*** 448,462 ****
  
  
- #**************************************************************************
- # class TupleComp Documentation
- #**************************************************************************
- # This class provides a generic function for comparing any two tuples.
- # Each instance records a list of tuple-indicies (from most significant
- # to least significant), and sort direction (ascending or decending) for
- # each tuple-index.  The compare functions can then be used as the function
- # argument to the system sort() function when a list of tuples need to be
- # sorted in the instances order.
- #**************************************************************************
  class TupleComp:
  	def __init__(self, comp_select_list):
  		self.comp_select_list = comp_select_list
--- 446,457 ----
  
  
  class TupleComp:
+ 	"""This class provides a generic function for comparing any two tuples.
+ 	Each instance records a list of tuple-indicies (from most significant
+ 	to least significant), and sort direction (ascending or decending) for
+ 	each tuple-index.  The compare functions can then be used as the function
+ 	argument to the system sort() function when a list of tuples need to be
+ 	sorted in the instances order."""
+ 
  	def __init__(self, comp_select_list):
  		self.comp_select_list = comp_select_list
***************
*** 496,501 ****
  #**************************************************************************
  
!     # Add together all the stats for two profile entries
! def add_func_stats(target, source):				
  	cc, nc, tt, ct, callers = source
  	t_cc, t_nc, t_tt, t_ct, t_callers = target
--- 491,496 ----
  #**************************************************************************
  
! def add_func_stats(target, source):
! 	"""Add together all the stats for two profile entries."""
  	cc, nc, tt, ct, callers = source
  	t_cc, t_nc, t_tt, t_ct, t_callers = target
***************
*** 504,509 ****
  
  
-     # Combine two caller lists in a single list.
  def add_callers(target, source):
  	new_callers = {}
  	for func in target.keys():
--- 499,504 ----
  
  
  def add_callers(target, source):
+ 	"""Combine two caller lists in a single list."""
  	new_callers = {}
  	for func in target.keys():
***************
*** 516,521 ****
  	return new_callers
  
-      # Sum the caller statistics to get total number of calls recieved
  def count_calls(callers):
  	nc = 0
  	for func in callers.keys():
--- 511,516 ----
  	return new_callers
  
  def count_calls(callers):
+ 	"""Sum the caller statistics to get total number of calls received."""
  	nc = 0
  	for func in callers.keys():
***************
*** 529,532 ****
  def f8(x):
  	return string.rjust(fpformat.fix(x, 3), 8)
- 
  
--- 524,526 ----

Index: pty.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pty.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pty.py	1999/05/03 18:13:51	1.2
--- pty.py	2000/02/04 15:10:34	1.3
***************
*** 1,3 ****
! # pty.py -- Pseudo terminal utilities.
  
  # Bugs: No signal handling.  Doesn't set slave termios and window size.
--- 1,3 ----
! """Pseudo terminal utilities."""
  
  # Bugs: No signal handling.  Doesn't set slave termios and window size.
***************
*** 17,22 ****
  CHILD = 0
  
- # Open pty master.  Returns (master_fd, tty_name).  SGI and Linux/BSD version.
  def master_open():
  	try:
  		import sgi
--- 17,23 ----
  CHILD = 0
  
  def master_open():
+ 	"""Open pty master and return (master_fd, tty_name).
+ 	SGI and Linux/BSD version."""
  	try:
  		import sgi
***************
*** 39,50 ****
  	raise os.error, 'out of pty devices'
  
- # Open the pty slave.  Acquire the controlling terminal.
- # Returns file descriptor.  Linux version.  (Should be universal? --Guido)
  def slave_open(tty_name):
  	return os.open(tty_name, FCNTL.O_RDWR)
  
- # Fork and make the child a session leader with a controlling terminal.
- # Returns (pid, master_fd)
  def fork():
  	master_fd, tty_name = master_open() 
  	pid = os.fork()
--- 40,52 ----
  	raise os.error, 'out of pty devices'
  
  def slave_open(tty_name):
+ 	"""Open the pty slave and acquire the controlling terminal.
+ 	Return the file descriptor.  Linux version."""
+ 	# (Should be universal? --Guido)
  	return os.open(tty_name, FCNTL.O_RDWR)
  
  def fork():
+ 	"""Fork and make the child a session leader with a controlling terminal.
+ 	Return (pid, master_fd)."""
  	master_fd, tty_name = master_open() 
  	pid = os.fork()
***************
*** 67,85 ****
  	return pid, master_fd
  
- # Write all the data to a descriptor.
  def writen(fd, data):
  	while data != '':
  		n = os.write(fd, data)
  		data = data[n:]
  
- # Default read function.
  def read(fd):
  	return os.read(fd, 1024)
  
- # Parent copy loop.
- # Copies  
- # 	pty master -> standard output	(master_read)
- # 	standard input -> pty master	(stdin_read)
  def copy(master_fd, master_read=read, stdin_read=read):
  	while 1:
  		rfds, wfds, xfds = select(
--- 69,87 ----
  	return pid, master_fd
  
  def writen(fd, data):
+ 	"""Write all the data to a descriptor."""
  	while data != '':
  		n = os.write(fd, data)
  		data = data[n:]
  
  def read(fd):
+ 	"""Default read function."""
  	return os.read(fd, 1024)
  
  def copy(master_fd, master_read=read, stdin_read=read):
+ 	"""Parent copy loop.
+ 	Copies  
+ 	  	pty master -> standard output	(master_read)
+ 	  	standard input -> pty master	(stdin_read)"""
  	while 1:
  		rfds, wfds, xfds = select(
***************
*** 92,97 ****
  			writen(master_fd, data)
  
- # Create a spawned process.
  def spawn(argv, master_read=read, stdin_read=read):
  	if type(argv) == type(''):
  		argv = (argv,)
--- 94,99 ----
  			writen(master_fd, data)
  
  def spawn(argv, master_read=read, stdin_read=read):
+ 	"""Create a spawned process."""
  	if type(argv) == type(''):
  		argv = (argv,)

Index: py_compile.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/py_compile.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** py_compile.py	1998/10/07 14:06:03	1.14
--- py_compile.py	2000/02/04 15:10:34	1.15
***************
*** 8,12 ****
  
  def wr_long(f, x):
!     "Internal; write a 32-bit int to a file in little-endian order."
      f.write(chr( x        & 0xff))
      f.write(chr((x >> 8)  & 0xff))
--- 8,12 ----
  
  def wr_long(f, x):
!     """Internal; write a 32-bit int to a file in little-endian order."""
      f.write(chr( x        & 0xff))
      f.write(chr((x >> 8)  & 0xff))



From guido@cnri.reston.va.us  Fri Feb  4 15:28:48 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 4 Feb 2000 10:28:48 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib quopri.py,1.5,1.6 random.py,1.12,1.13 regex_syntax.py,1.2,1.3 regsub.py,1.6,1.7 repr.py,1.5,1.6 sgmllib.py,1.18,1.19 shlex.py,1.4,1.5 shutil.py,1.14,1.15 stat.py,1.6,1.7 statcache.py,1.5,1.6 statvfs.py,1.3,1.4 string.py,1.45,1.46 sunau.py,1.14,1.15 sunaudio.py,1.3,1.4 symbol.py,1.8,1.9 tempfile.py,1.19,1.20 threading.py,1.5,1.6 toaiff.py,1.4,1.5 token.py,1.6,1.7 traceback.py,1.13,1.14 tty.py,1.1,1.2 types.py,1.12,1.13 tzparse.py,1.6,1.7 urllib.py,1.90,1.91 urllib2.py,1.1,1.2 urlparse.py,1.21,1.22 uu.py,1.10,1.11 wave.py,1.8,1.9 whrandom.py,1.14,1.15
Message-ID: <200002041528.KAA09987@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	quopri.py random.py regex_syntax.py regsub.py repr.py 
	sgmllib.py shlex.py shutil.py stat.py statcache.py statvfs.py 
	string.py sunau.py sunaudio.py symbol.py tempfile.py 
	threading.py toaiff.py token.py traceback.py tty.py types.py 
	tzparse.py urllib.py urllib2.py urlparse.py uu.py wave.py 
	whrandom.py 
Log Message:
The third and final doc-string sweep by Ka-Ping Yee.

The attached patches update the standard library so that all modules
have docstrings beginning with one-line summaries.

A new docstring was added to formatter.  The docstring for os.py
was updated to mention nt, os2, ce in addition to posix, dos, mac.



Index: quopri.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/quopri.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** quopri.py	1998/03/26 20:52:26	1.5
--- quopri.py	2000/02/04 15:28:40	1.6
***************
*** 1,5 ****
  #! /usr/bin/env python
  
! # Conversions to/from quoted-printable transport encoding as per RFC-1521
  # (Dec 1991 version).
  
--- 1,6 ----
  #! /usr/bin/env python
  
! """Conversions to/from quoted-printable transport encoding as per RFC-1521."""
! 
  # (Dec 1991 version).
  
***************
*** 9,12 ****
--- 10,16 ----
  
  def needsquoting(c, quotetabs):
+ 	"""Decide whether a particular character needs to be quoted.
+ 
+ 	The 'quotetabs' flag indicates whether tabs should be quoted."""
  	if c == '\t':
  		return not quotetabs
***************
*** 14,17 ****
--- 18,22 ----
  
  def quote(c):
+ 	"""Quote a single character."""
  	if c == ESCAPE:
  		return ESCAPE * 2
***************
*** 21,24 ****
--- 26,33 ----
  
  def encode(input, output, quotetabs):
+ 	"""Read 'input', apply quoted-printable encoding, and write to 'output'.
+ 
+ 	'input' and 'output' are files with readline() and write() methods.
+ 	The 'quotetabs' flag indicates whether tabs should be quoted."""
  	while 1:
  		line = input.readline()
***************
*** 43,46 ****
--- 52,58 ----
  
  def decode(input, output):
+ 	"""Read 'input', apply quoted-printable decoding, and write to 'output'.
+ 
+ 	'input' and 'output' are files with readline() and write() methods."""
  	new = ''
  	while 1:
***************
*** 74,80 ****
--- 86,94 ----
  
  def ishex(c):
+ 	"""Return true if the character 'c' is a hexadecimal digit."""
  	return '0' <= c <= '9' or 'a' <= c <= 'f' or 'A' <= c <= 'F'
  
  def unhex(s):
+ 	"""Get the integer value of a hexadecimal number."""
  	bits = 0
  	for c in s:

Index: random.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/random.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** random.py	1999/08/18 13:53:28	1.12
--- random.py	2000/02/04 15:28:40	1.13
***************
*** 1,22 ****
! #	R A N D O M   V A R I A B L E   G E N E R A T O R S
! #
! #	distributions on the real line:
! #	------------------------------
! #	       normal (Gaussian)
! #	       lognormal
! #	       negative exponential
! #	       gamma
! #	       beta
! #
! #	distributions on the circle (angles 0 to 2pi)
! #	---------------------------------------------
! #	       circular uniform
! #	       von Mises
  
! # Translated from anonymously contributed C/C++ source.
  
! # Multi-threading note: the random number generator used here is not
! # thread-safe; it is possible that two calls return the same random
! # value.  See whrandom.py for more info.
  
  import whrandom
--- 1,23 ----
! """Random variable generators.
  
!     distributions on the real line:
!     ------------------------------
!            normal (Gaussian)
!            lognormal
!            negative exponential
!            gamma
!            beta
  
!     distributions on the circle (angles 0 to 2pi)
!     ---------------------------------------------
!            circular uniform
!            von Mises
! 
! Translated from anonymously contributed C/C++ source.
! 
! Multi-threading note: the random number generator used here is not
! thread-safe; it is possible that two calls return the same random
! value.  See whrandom.py for more info.
! """
  
  import whrandom

Index: regex_syntax.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/regex_syntax.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** regex_syntax.py	1997/10/22 16:28:53	1.2
--- regex_syntax.py	2000/02/04 15:28:40	1.3
***************
*** 1,4 ****
! # These bits are passed to regex.set_syntax() to choose among
! # alternative regexp syntaxes.
  
  # 1 means plain parentheses serve as grouping, and backslash
--- 1,10 ----
! """Constants for selecting regexp syntaxes for the obsolete regex module.
! 
! This module is only for backward compatibility.  "regex" has now
! been replaced by the new regular expression module, "re".
! 
! These bits are passed to regex.set_syntax() to choose among
! alternative regexp syntaxes.
! """
  
  # 1 means plain parentheses serve as grouping, and backslash

Index: regsub.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/regsub.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** regsub.py	1997/02/18 18:52:55	1.6
--- regsub.py	2000/02/04 15:28:40	1.7
***************
*** 1,9 ****
! # Regular expression subroutines:
! # sub(pat, repl, str): replace first occurrence of pattern in string
! # gsub(pat, repl, str): replace all occurrences of pattern in string
! # split(str, pat, maxsplit): split string using pattern as delimiter
! # splitx(str, pat, maxsplit): split string using pattern as delimiter plus
! #			      return delimiters
  
  
  import regex
--- 1,13 ----
! """Regexp-based split and replace using the obsolete regex module.
  
+ This module is only for backward compatibility.  These operations
+ are now provided by the new regular expression module, "re".
+ 
+ sub(pat, repl, str):        replace first occurrence of pattern in string
+ gsub(pat, repl, str):       replace all occurrences of pattern in string
+ split(str, pat, maxsplit):  split string using pattern as delimiter
+ splitx(str, pat, maxsplit): split string using pattern as delimiter plus
+                             return delimiters
+ """
  
  import regex

Index: repr.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/repr.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** repr.py	1999/06/23 23:27:05	1.5
--- repr.py	2000/02/04 15:28:40	1.6
***************
*** 1,3 ****
! # Redo the `...` (representation) but with limits on most sizes.
  
  import string
--- 1,3 ----
! """Redo the `...` (representation) but with limits on most sizes."""
  
  import string

Index: sgmllib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/sgmllib.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** sgmllib.py	1999/01/25 21:57:07	1.18
--- sgmllib.py	2000/02/04 15:28:40	1.19
***************
*** 1,3 ****
! # A parser for SGML, using the derived class as static DTD.
  
  # XXX This only supports those SGML features used by HTML.
--- 1,3 ----
! """A parser for SGML, using the derived class as a static DTD."""
  
  # XXX This only supports those SGML features used by HTML.

Index: shlex.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/shlex.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** shlex.py	1999/05/03 18:14:16	1.4
--- shlex.py	2000/02/04 15:28:40	1.5
***************
*** 1,2 ****
--- 1,4 ----
+ """A lexical analyzer class for simple shell-like syntaxes."""
+ 
  # Module and documentation by Eric S. Raymond, 21 Dec 1998 
  

Index: shutil.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/shutil.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** shutil.py	1999/08/18 20:03:17	1.14
--- shutil.py	2000/02/04 15:28:41	1.15
***************
*** 1,3 ****
! """Utility functions for copying files.
  
  XXX The functions here don't copy the resource fork or other metadata on Mac.
--- 1,3 ----
! """Utility functions for copying files and directory trees.
  
  XXX The functions here don't copy the resource fork or other metadata on Mac.

Index: stat.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/stat.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** stat.py	1994/08/23 13:32:17	1.6
--- stat.py	2000/02/04 15:28:41	1.7
***************
*** 1,9 ****
! # Module 'stat'
! #
! # Defines constants and functions for interpreting stat/lstat struct
! # as returned by os.stat() and os.lstat() (if it exists).
! #
! # Suggested usage: from stat import *
! #
  # XXX Strictly spoken, this module may have to be adapted for each POSIX
  # implementation; in practice, however, the numeric constants used by
--- 1,7 ----
! """Constants/functions for interpreting results of os.stat() and os.lstat().
! 
! Suggested usage: from stat import *
! """
! 
  # XXX Strictly spoken, this module may have to be adapted for each POSIX
  # implementation; in practice, however, the numeric constants used by

Index: statcache.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/statcache.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** statcache.py	1995/12/07 10:16:45	1.5
--- statcache.py	2000/02/04 15:28:41	1.6
***************
*** 1,6 ****
! # Module 'statcache'
! #
! # Maintain a cache of file stats.
! # There are functions to reset the cache or to selectively remove items.
  
  import os
--- 1,5 ----
! """Maintain a cache of file stats.
! There are functions to reset the cache or to selectively remove items.
! """
  
  import os
***************
*** 13,19 ****
  
  
- # Stat a file, possibly out of the cache.
- #
  def stat(path):
  	if cache.has_key(path):
  		return cache[path]
--- 12,17 ----
  
  
  def stat(path):
+ 	"""Stat a file, possibly out of the cache."""
  	if cache.has_key(path):
  		return cache[path]
***************
*** 22,42 ****
  
  
- # Reset the cache completely.
- #
  def reset():
  	global cache
  	cache = {}
  
  
- # Remove a given item from the cache, if it exists.
- #
  def forget(path):
  	if cache.has_key(path):
  		del cache[path]
  
  
- # Remove all pathnames with a given prefix.
- #
  def forget_prefix(prefix):
  	n = len(prefix)
  	for path in cache.keys():
--- 20,37 ----
  
  
  def reset():
+ 	"""Reset the cache completely."""
  	global cache
  	cache = {}
  
  
  def forget(path):
+ 	"""Remove a given item from the cache, if it exists."""
  	if cache.has_key(path):
  		del cache[path]
  
  
  def forget_prefix(prefix):
+ 	"""Remove all pathnames with a given prefix."""
  	n = len(prefix)
  	for path in cache.keys():
***************
*** 45,52 ****
  
  
- # Forget about a directory and all entries in it, but not about
- # entries in subdirectories.
- #
  def forget_dir(prefix):
  	if prefix[-1:] == '/' and prefix <> '/':
  		prefix = prefix[:-1]
--- 40,46 ----
  
  
  def forget_dir(prefix):
+ 	"""Forget about a directory and all entries in it, but not about
+ 	entries in subdirectories."""
  	if prefix[-1:] == '/' and prefix <> '/':
  		prefix = prefix[:-1]
***************
*** 63,70 ****
  
  
- # Remove all pathnames except with a given prefix.
- # Normally used with prefix = '/' after a chdir().
- #
  def forget_except_prefix(prefix):
  	n = len(prefix)
  	for path in cache.keys():
--- 57,63 ----
  
  
  def forget_except_prefix(prefix):
+ 	"""Remove all pathnames except with a given prefix.
+ 	Normally used with prefix = '/' after a chdir()."""
  	n = len(prefix)
  	for path in cache.keys():
***************
*** 73,79 ****
  
  
- # Check for directory.
- #
  def isdir(path):
  	try:
  		st = stat(path)
--- 66,71 ----
  
  
  def isdir(path):
+ 	"""Check for directory."""
  	try:
  		st = stat(path)

Index: statvfs.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/statvfs.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** statvfs.py	1999/02/10 13:12:07	1.3
--- statvfs.py	2000/02/04 15:28:41	1.4
***************
*** 1,7 ****
! # Module 'statvfs'
! #
! # Defines constants for interpreting statvfs struct as returned
! # by os.statvfs() and os.fstatvfs() (if they exist).
! #
  
  # Indices for statvfs struct members in the tuple returned by
--- 1,3 ----
! """Constants for interpreting the results of os.statvfs() and os.fstatvfs()."""
  
  # Indices for statvfs struct members in the tuple returned by

Index: string.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/string.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** string.py	1999/11/04 19:18:44	1.45
--- string.py	2000/02/04 15:28:41	1.46
***************
*** 1,10 ****
! # module 'string' -- A collection of string operations
  
! # Warning: most of the code you see here isn't normally used nowadays.  With
! # Python 1.6, many of these functions are implemented as methods on the
! # standard string object. They used to be implemented by a built-in module
! # called strop, but strop is now obsolete itself.
! 
! """Common string manipulations.
  
  Public module variables:
--- 1,8 ----
! """A collection of string operations (most are no longer used in Python 1.6).
  
! Warning: most of the code you see here isn't normally used nowadays.  With
! Python 1.6, many of these functions are implemented as methods on the
! standard string object. They used to be implemented by a built-in module
! called strop, but strop is now obsolete itself.
  
  Public module variables:

Index: sunau.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/sunau.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** sunau.py	1999/06/22 21:23:23	1.14
--- sunau.py	2000/02/04 15:28:41	1.15
***************
*** 1,105 ****
! # Stuff to parse Sun and NeXT audio files.
! #
! # An audio consists of a header followed by the data.  The structure
! # of the header is as follows.
! #
! #	+---------------+
! #	| magic word    |
! #	+---------------+
! #	| header size   |
! #	+---------------+
! #	| data size     |
! #	+---------------+
! #	| encoding      |
! #	+---------------+
! #	| sample rate   |
! #	+---------------+
! #	| # of channels |
! #	+---------------+
! #	| info          |
! #	|               |
! #	+---------------+
! #
! # The magic word consists of the 4 characters '.snd'.  Apart from the
! # info field, all header fields are 4 bytes in size.  They are all
! # 32-bit unsigned integers encoded in big-endian byte order.
! #
! # The header size really gives the start of the data.
! # The data size is the physical size of the data.  From the other
! # parameter the number of frames can be calculated.
! # The encoding gives the way in which audio samples are encoded.
! # Possible values are listed below.
! # The info field currently consists of an ASCII string giving a
! # human-readable description of the audio file.  The info field is
! # padded with NUL bytes to the header size.
! #
! # Usage.
! #
! # Reading audio files:
! #	f = sunau.open(file, 'r')
! # where file is either the name of a file or an open file pointer.
! # The open file pointer must have methods read(), seek(), and close().
! # When the setpos() and rewind() methods are not used, the seek()
! # method is not  necessary.
! #
! # This returns an instance of a class with the following public methods:
! #	getnchannels()	-- returns number of audio channels (1 for
! #			   mono, 2 for stereo)
! #	getsampwidth()	-- returns sample width in bytes
! #	getframerate()	-- returns sampling frequency
! #	getnframes()	-- returns number of audio frames
! #	getcomptype()	-- returns compression type ('NONE' or 'ULAW')
! #	getcompname()	-- returns human-readable version of
! #			   compression type ('not compressed' matches 'NONE')
! #	getparams()	-- returns a tuple consisting of all of the
! #			   above in the above order
! #	getmarkers()	-- returns None (for compatibility with the
! #			   aifc module)
! #	getmark(id)	-- raises an error since the mark does not
! #			   exist (for compatibility with the aifc module)
! #	readframes(n)	-- returns at most n frames of audio
! #	rewind()	-- rewind to the beginning of the audio stream
! #	setpos(pos)	-- seek to the specified position
! #	tell()		-- return the current position
! #	close()		-- close the instance (make it unusable)
! # The position returned by tell() and the position given to setpos()
! # are compatible and have nothing to do with the actual postion in the
! # file.
! # The close() method is called automatically when the class instance
! # is destroyed.
! #
! # Writing audio files:
! #	f = sunau.open(file, 'w')
! # where file is either the name of a file or an open file pointer.
! # The open file pointer must have methods write(), tell(), seek(), and
! # close().
! #
! # This returns an instance of a class with the following public methods:
! #	setnchannels(n)	-- set the number of channels
! #	setsampwidth(n)	-- set the sample width
! #	setframerate(n)	-- set the frame rate
! #	setnframes(n)	-- set the number of frames
! #	setcomptype(type, name)
! #			-- set the compression type and the
! #			   human-readable compression type
! #	setparams(tuple)-- set all parameters at once
! #	tell()		-- return current position in output file
! #	writeframesraw(data)
! #			-- write audio frames without pathing up the
! #			   file header
! #	writeframes(data)
! #			-- write audio frames and patch up the file header
! #	close()		-- patch up the file header and close the
! #			   output file
! # You should set the parameters before the first writeframesraw or
! # writeframes.  The total number of frames does not need to be set,
! # but when it is set to the correct value, the header does not have to
! # be patched up.
! # It is best to first set all parameters, perhaps possibly the
! # compression type, and then write audio frames using writeframesraw.
! # When all frames have been written, either call writeframes('') or
! # close() to patch up the sizes in the header.
! # The close() method is called automatically when the class instance
! # is destroyed.
  
  # from <multimedia/audio_filehdr.h>
--- 1,106 ----
! """Stuff to parse Sun and NeXT audio files.
! 
! An audio consists of a header followed by the data.  The structure
! of the header is as follows.
! 
!         +---------------+
!         | magic word    |
!         +---------------+
!         | header size   |
!         +---------------+
!         | data size     |
!         +---------------+
!         | encoding      |
!         +---------------+
!         | sample rate   |
!         +---------------+
!         | # of channels |
!         +---------------+
!         | info          |
!         |               |
!         +---------------+
! 
! The magic word consists of the 4 characters '.snd'.  Apart from the
! info field, all header fields are 4 bytes in size.  They are all
! 32-bit unsigned integers encoded in big-endian byte order.
! 
! The header size really gives the start of the data.
! The data size is the physical size of the data.  From the other
! parameter the number of frames can be calculated.
! The encoding gives the way in which audio samples are encoded.
! Possible values are listed below.
! The info field currently consists of an ASCII string giving a
! human-readable description of the audio file.  The info field is
! padded with NUL bytes to the header size.
! 
! Usage.
! 
! Reading audio files:
!         f = sunau.open(file, 'r')
! where file is either the name of a file or an open file pointer.
! The open file pointer must have methods read(), seek(), and close().
! When the setpos() and rewind() methods are not used, the seek()
! method is not  necessary.
! 
! This returns an instance of a class with the following public methods:
!         getnchannels()	-- returns number of audio channels (1 for
!         		   mono, 2 for stereo)
!         getsampwidth()	-- returns sample width in bytes
!         getframerate()	-- returns sampling frequency
!         getnframes()	-- returns number of audio frames
!         getcomptype()	-- returns compression type ('NONE' or 'ULAW')
!         getcompname()	-- returns human-readable version of
!         		   compression type ('not compressed' matches 'NONE')
!         getparams()	-- returns a tuple consisting of all of the
!         		   above in the above order
!         getmarkers()	-- returns None (for compatibility with the
!         		   aifc module)
!         getmark(id)	-- raises an error since the mark does not
!         		   exist (for compatibility with the aifc module)
!         readframes(n)	-- returns at most n frames of audio
!         rewind()	-- rewind to the beginning of the audio stream
!         setpos(pos)	-- seek to the specified position
!         tell()		-- return the current position
!         close()		-- close the instance (make it unusable)
! The position returned by tell() and the position given to setpos()
! are compatible and have nothing to do with the actual postion in the
! file.
! The close() method is called automatically when the class instance
! is destroyed.
! 
! Writing audio files:
!         f = sunau.open(file, 'w')
! where file is either the name of a file or an open file pointer.
! The open file pointer must have methods write(), tell(), seek(), and
! close().
! 
! This returns an instance of a class with the following public methods:
!         setnchannels(n)	-- set the number of channels
!         setsampwidth(n)	-- set the sample width
!         setframerate(n)	-- set the frame rate
!         setnframes(n)	-- set the number of frames
!         setcomptype(type, name)
!         		-- set the compression type and the
!         		   human-readable compression type
!         setparams(tuple)-- set all parameters at once
!         tell()		-- return current position in output file
!         writeframesraw(data)
!         		-- write audio frames without pathing up the
!         		   file header
!         writeframes(data)
!         		-- write audio frames and patch up the file header
!         close()		-- patch up the file header and close the
!         		   output file
! You should set the parameters before the first writeframesraw or
! writeframes.  The total number of frames does not need to be set,
! but when it is set to the correct value, the header does not have to
! be patched up.
! It is best to first set all parameters, perhaps possibly the
! compression type, and then write audio frames using writeframesraw.
! When all frames have been written, either call writeframes('') or
! close() to patch up the sizes in the header.
! The close() method is called automatically when the class instance
! is destroyed.
! """
  
  # from <multimedia/audio_filehdr.h>

Index: sunaudio.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/sunaudio.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** sunaudio.py	1992/06/03 16:47:49	1.3
--- sunaudio.py	2000/02/04 15:28:41	1.4
***************
*** 1,3 ****
! # Module 'sunaudio' -- interpret sun audio headers
  
  MAGIC = '.snd'
--- 1,3 ----
! """Interpret sun audio headers."""
  
  MAGIC = '.snd'
***************
*** 6,18 ****
  
  
- # convert a 4-char value to integer
- 
  def get_long_be(s):
  	return (ord(s[0])<<24) | (ord(s[1])<<16) | (ord(s[2])<<8) | ord(s[3])
  
  
- # read a sound header from an open file
- 
  def gethdr(fp):
  	if fp.read(4) <> MAGIC:
  		raise error, 'gethdr: bad magic word'
--- 6,16 ----
  
  
  def get_long_be(s):
+ 	"""Convert a 4-char value to integer."""
  	return (ord(s[0])<<24) | (ord(s[1])<<16) | (ord(s[2])<<8) | ord(s[3])
  
  
  def gethdr(fp):
+ 	"""Read a sound header from an open file."""
  	if fp.read(4) <> MAGIC:
  		raise error, 'gethdr: bad magic word'
***************
*** 32,38 ****
  
  
- # read and print the sound header of a named file
- 
  def printhdr(file):
  	hdr = gethdr(open(file, 'r'))
  	data_size, encoding, sample_rate, channels, info = hdr
--- 30,35 ----
  
  
  def printhdr(file):
+ 	"""Read and print the sound header of a named file."""
  	hdr = gethdr(open(file, 'r'))
  	data_size, encoding, sample_rate, channels, info = hdr

Index: symbol.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/symbol.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** symbol.py	1998/03/26 21:13:02	1.8
--- symbol.py	2000/02/04 15:28:41	1.9
***************
*** 1,6 ****
  #! /usr/bin/env python
! #
! #  Non-terminal symbols of Python grammar (from "graminit.h")
! #
  #  This file is automatically generated; please don't muck it up!
  #
--- 1,6 ----
  #! /usr/bin/env python
! 
! """Non-terminal symbols of Python grammar (from "graminit.h")."""
! 
  #  This file is automatically generated; please don't muck it up!
  #

Index: tempfile.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/tempfile.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** tempfile.py	1999/06/01 18:55:36	1.19
--- tempfile.py	2000/02/04 15:28:41	1.20
***************
*** 1,4 ****
! # Temporary file name allocation
! #
  # XXX This tries to be not UNIX specific, but I don't know beans about
  # how to choose a temp directory or filename on MS-DOS or other
--- 1,4 ----
! """Temporary files and filenames."""
! 
  # XXX This tries to be not UNIX specific, but I don't know beans about
  # how to choose a temp directory or filename on MS-DOS or other
***************
*** 15,21 ****
  
  
- # Function to calculate the directory to use
- 
  def gettempdir():
      global tempdir
      if tempdir is not None:
--- 15,20 ----
  
  
  def gettempdir():
+     """Function to calculate the directory to use."""
      global tempdir
      if tempdir is not None:
***************
*** 59,67 ****
  
  
- # Function to calculate a prefix of the filename to use
- 
  _pid = None
  
  def gettempprefix():
      global template, _pid
      if os.name == 'posix' and _pid and _pid != os.getpid():
--- 58,65 ----
  
  
  _pid = None
  
  def gettempprefix():
+     """Function to calculate a prefix of the filename to use."""
      global template, _pid
      if os.name == 'posix' and _pid and _pid != os.getpid():
***************
*** 86,92 ****
  
  
- # User-callable function to return a unique temporary file name
- 
  def mktemp(suffix=""):
      global counter
      dir = gettempdir()
--- 84,89 ----
  
  
  def mktemp(suffix=""):
+     """User-callable function to return a unique temporary file name."""
      global counter
      dir = gettempdir()
***************
*** 127,130 ****
--- 124,128 ----
  
  def TemporaryFile(mode='w+b', bufsize=-1, suffix=""):
+     """Create and return a temporary file (opened read-write by default)."""
      name = mktemp(suffix)
      if os.name == 'posix':

Index: threading.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/threading.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** threading.py	1999/09/29 15:26:52	1.5
--- threading.py	2000/02/04 15:28:41	1.6
***************
*** 1,4 ****
! # threading.py:
! # Proposed new threading module, emulating a subset of Java's threading model
  
  import sys
--- 1,3 ----
! """Proposed new threading module, emulating a subset of Java's threading model."""
  
  import sys

Index: toaiff.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/toaiff.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** toaiff.py	1999/02/24 18:49:15	1.4
--- toaiff.py	2000/02/04 15:28:41	1.5
***************
*** 1,9 ****
! # Convert "arbitrary" sound files to AIFF files (Apple and SGI's audio format).
! # Input may be compressed.
! # Uncompressed file type may be AIFF, WAV, VOC, 8SVX, NeXT/Sun, and others.
! # An exception is raised if the file is not of a recognized type.
! # Returned filename is either the input filename or a temporary filename;
! # in the latter case the caller must ensure that it is removed.
! # Other temporary files used are removed by the function.
  
  import os
--- 1,11 ----
! """Convert "arbitrary" sound files to AIFF (Apple and SGI's audio format).
! 
! Input may be compressed.
! Uncompressed file type may be AIFF, WAV, VOC, 8SVX, NeXT/Sun, and others.
! An exception is raised if the file is not of a recognized type.
! Returned filename is either the input filename or a temporary filename;
! in the latter case the caller must ensure that it is removed.
! Other temporary files used are removed by the function.
! """
  
  import os

Index: token.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/token.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** token.py	1998/03/26 21:13:08	1.6
--- token.py	2000/02/04 15:28:41	1.7
***************
*** 1,6 ****
  #! /usr/bin/env python
! #
! #  Tokens (from "token.h")
! #
  #  This file is automatically generated; please don't muck it up!
  #
--- 1,6 ----
  #! /usr/bin/env python
! 
! """Token constants (from "token.h")."""
! 
  #  This file is automatically generated; please don't muck it up!
  #

Index: traceback.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/traceback.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** traceback.py	1998/03/18 17:48:06	1.13
--- traceback.py	2000/02/04 15:28:41	1.14
***************
*** 1,3 ****
! # Format and print Python stack traces
  
  import linecache
--- 1,3 ----
! """Extract, format and print information about Python stack traces."""
  
  import linecache
***************
*** 11,14 ****
--- 11,16 ----
  
  def print_list(extracted_list, file=None):
+ 	"""Print the list of tuples as returned by extract_tb() or
+ 	extract_stack() as a formatted stack trace to the given file."""
  	if not file:
  		file = sys.stderr
***************
*** 20,23 ****
--- 22,31 ----
  
  def format_list(extracted_list):
+ 	"""Given a list of tuples as returned by extract_tb() or
+ 	extract_stack(), return a list of strings ready for printing.
+ 	Each string in the resulting list corresponds to the item with
+ 	the same index in the argument list.  Each string ends in a
+ 	newline; the strings may contain internal newlines as well, for
+ 	those items whose source text line is not None."""
  	list = []
  	for filename, lineno, name, line in extracted_list:
***************
*** 30,33 ****
--- 38,45 ----
  
  def print_tb(tb, limit=None, file=None):
+ 	"""Print up to 'limit' stack trace entries from the traceback 'tb'.
+ 	If 'limit' is omitted or None, all entries are printed.  If 'file' is
+ 	omitted or None, the output goes to sys.stderr; otherwise 'file'
+ 	should be an open file or file-like object with a write() method."""
  	if not file:
  		file = sys.stderr
***************
*** 50,56 ****
--- 62,77 ----
  
  def format_tb(tb, limit = None):
+ 	"""A shorthand for 'format_list(extract_stack(f, limit))."""
  	return format_list(extract_tb(tb, limit))
  
  def extract_tb(tb, limit = None):
+ 	"""Return a list of up to 'limit' pre-processed stack trace entries
+ 	extracted from the traceback object 'traceback'.  This is useful for
+ 	alternate formatting of stack traces.  If 'limit' is omitted or None,
+ 	all entries are extracted.  A pre-processed stack trace entry is a
+ 	quadruple (filename, line number, function name, text) representing
+ 	the information that is usually printed for a stack trace.  The text
+ 	is a string with leading and trailing whitespace stripped; if the
+ 	source is not available it is None."""
  	if limit is None:
  		if hasattr(sys, 'tracebacklimit'):
***************
*** 74,77 ****
--- 95,106 ----
  
  def print_exception(etype, value, tb, limit=None, file=None):
+ 	"""Print exception information and up to 'limit' stack trace entries
+ 	from the traceback 'tb' to 'file'.  This differs from print_tb() in
+ 	the following ways: (1) if traceback is not None, it prints a header
+ 	"Traceback (innermost last):"; (2) it prints the exception type and
+ 	value after the stack trace; (3) if type is SyntaxError and value has
+ 	the appropriate format, it prints the line where the syntax error
+ 	occurred with a caret on the next line indicating the approximate
+ 	position of the error."""
  	if not file:
  		file = sys.stderr
***************
*** 85,88 ****
--- 114,123 ----
  
  def format_exception(etype, value, tb, limit = None):
+ 	"""Format a stack trace and the exception information.  The arguments
+ 	have the same meaning as the corresponding arguments to
+ 	print_exception().  The return value is a list of strings, each
+ 	ending in a newline and some containing internal newlines.  When 
+ 	these lines are contatenated and printed, exactly the same text is
+ 	printed as does print_exception()."""
  	if tb:
  		list = ['Traceback (innermost last):\n']
***************
*** 94,97 ****
--- 129,140 ----
  
  def format_exception_only(etype, value):
+ 	"""Format the exception part of a traceback.  The arguments are the
+ 	exception type and value such as given by sys.last_type and
+ 	sys.last_value. The return value is a list of strings, each ending
+ 	in a newline.  Normally, the list contains a single string;
+ 	however, for SyntaxError exceptions, it contains several lines that
+ 	(when printed) display detailed information about where the syntax
+ 	error occurred.  The message indicating which exception occurred is
+ 	the always last string in the list."""
  	list = []
  	if type(etype) == types.ClassType:
***************
*** 129,132 ****
--- 172,179 ----
  
  def print_exc(limit=None, file=None):
+ 	"""This is a shorthand for 'print_exception(sys.exc_type,
+ 	sys.exc_value, sys.exc_traceback, limit, file)'.
+ 	(In fact, it uses sys.exc_info() to retrieve the same information
+ 	in a thread-safe way.)"""
  	if not file:
  		file = sys.stderr
***************
*** 138,141 ****
--- 185,190 ----
  
  def print_last(limit=None, file=None):
+ 	"""This is a shorthand for 'print_exception(sys.last_type,
+ 	sys.last_value, sys.last_traceback, limit, file)'."""
  	if not file:
  		file = sys.stderr
***************
*** 145,148 ****
--- 194,201 ----
  
  def print_stack(f=None, limit=None, file=None):
+ 	"""This function prints a stack trace from its invocation point.
+ 	The optional 'f' argument can be used to specify an alternate stack
+ 	frame at which to start. The optional 'limit' and 'file' arguments
+ 	have the same meaning as for print_exception()."""
  	if f is None:
  		try:
***************
*** 153,156 ****
--- 206,210 ----
  
  def format_stack(f=None, limit=None):
+ 	"""A shorthand for 'format_list(extract_stack(f, limit))'."""
  	if f is None:
  		try:
***************
*** 161,164 ****
--- 215,224 ----
  
  def extract_stack(f=None, limit = None):
+ 	"""Extract the raw traceback from the current stack frame.  The
+ 	return value has the same format as for extract_tb().  The optional
+ 	'f' and 'limit' arguments have the same meaning as for print_stack(). 
+ 	Each item in the list is a quadruple (filename, line number,
+ 	function name, text), and the entries are in order from outermost
+ 	to innermost stack frame."""
  	if f is None:
  		try:
***************
*** 185,195 ****
  	return list
  
- # Calculate the correct line number of the traceback given in tb (even
- # with -O on).
- # Coded by Marc-Andre Lemburg from the example of PyCode_Addr2Line()
- # in compile.c.
- # Revised version by Jim Hugunin to work with JPython too.
- 
  def tb_lineno(tb):
  	c = tb.tb_frame.f_code
  	if not hasattr(c, 'co_lnotab'):
--- 245,256 ----
  	return list
  
  def tb_lineno(tb):
+ 	"""Calculate the correct line number of the traceback given in tb
+ 	(even with -O on)."""
+ 
+ 	# Coded by Marc-Andre Lemburg from the example of PyCode_Addr2Line()
+ 	# in compile.c.
+ 	# Revised version by Jim Hugunin to work with JPython too.
+ 
  	c = tb.tb_frame.f_code
  	if not hasattr(c, 'co_lnotab'):

Index: tty.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/tty.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** tty.py	1994/09/12 10:36:34	1.1
--- tty.py	2000/02/04 15:28:41	1.2
***************
*** 1,3 ****
! # tty.py -- Terminal utilities.
  # Author: Steen Lumholt.
  
--- 1,4 ----
! """Terminal utilities."""
! 
  # Author: Steen Lumholt.
  
***************
*** 14,19 ****
  CC = 6
  
- # Put terminal into a raw mode.
  def setraw(fd, when=TCSAFLUSH):
  	mode = tcgetattr(fd)
  	mode[IFLAG] = mode[IFLAG] & ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON)
--- 15,20 ----
  CC = 6
  
  def setraw(fd, when=TCSAFLUSH):
+ 	"""Put terminal into a raw mode."""
  	mode = tcgetattr(fd)
  	mode[IFLAG] = mode[IFLAG] & ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON)
***************
*** 26,31 ****
  	tcsetattr(fd, when, mode)
  
- # Put terminal into a cbreak mode.
  def setcbreak(fd, when=TCSAFLUSH):
  	mode = tcgetattr(fd)
  	mode[LFLAG] = mode[LFLAG] & ~(ECHO | ICANON)
--- 27,32 ----
  	tcsetattr(fd, when, mode)
  
  def setcbreak(fd, when=TCSAFLUSH):
+ 	"""Put terminal into a cbreak mode."""
  	mode = tcgetattr(fd)
  	mode[LFLAG] = mode[LFLAG] & ~(ECHO | ICANON)

Index: types.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/types.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** types.py	1999/03/19 19:08:03	1.12
--- types.py	2000/02/04 15:28:41	1.13
***************
*** 1,4 ****
! # Define names for all type symbols known in the standard interpreter.
! # Types that are part of optional modules (e.g. array) are not listed.
  
  import sys
--- 1,6 ----
! """Define names for all type symbols known in the standard interpreter.
! 
! Types that are part of optional modules (e.g. array) are not listed.
! """
  
  import sys

Index: tzparse.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/tzparse.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** tzparse.py	1997/10/22 20:58:20	1.6
--- tzparse.py	2000/02/04 15:28:41	1.7
***************
*** 1,3 ****
! # Parse a timezone specification.
  # XXX Unfinished.
  # XXX Only the typical form "XXXhhYYY;ddd/hh,ddd/hh" is currently supported.
--- 1,4 ----
! """Parse a timezone specification."""
! 
  # XXX Unfinished.
  # XXX Only the typical form "XXXhhYYY;ddd/hh,ddd/hh" is currently supported.
***************
*** 9,12 ****
--- 10,19 ----
  
  def tzparse(tzstr):
+ 	"""Given a timezone spec, return a tuple of information
+ 	(tzname, delta, dstname, daystart, hourstart, dayend, hourend),
+ 	where 'tzname' is the name of the timezone, 'delta' is the offset
+ 	in hours from GMT, 'dstname' is the name of the daylight-saving
+ 	timezone, and 'daystart'/'hourstart' and 'dayend'/'hourend'
+ 	specify the starting and ending points for daylight saving time."""
  	global tzprog
  	if tzprog == None:
***************
*** 25,28 ****
--- 32,38 ----
  
  def tzlocaltime(secs, params):
+ 	"""Given a Unix time in seconds and a tuple of information about
+ 	a timezone as returned by tzparse(), return the local time in the
+ 	form (year, month, day, hour, min, sec, yday, wday, tzname)."""
  	import time
  	(tzname, delta, dstname, daystart, hourstart, dayend, hourend) = params
***************
*** 35,38 ****
--- 45,49 ----
  
  def tzset():
+ 	"""Determine the current timezone from the "TZ" environment variable."""
  	global tzparams, timezone, altzone, daylight, tzname
  	import os
***************
*** 45,48 ****
--- 56,61 ----
  
  def isdst(secs):
+ 	"""Return true if daylight-saving time is in effect for the given
+ 	Unix time in the current timezone."""
  	import time
  	(tzname, delta, dstname, daystart, hourstart, dayend, hourend) = \
***************
*** 55,58 ****
--- 68,72 ----
  
  def localtime(secs):
+ 	"""Get the local time in the current timezone."""
  	return tzlocaltime(secs, tzparams)
  

Index: urllib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/urllib.py,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -r1.90 -r1.91
*** urllib.py	2000/02/01 23:36:55	1.90
--- urllib.py	2000/02/04 15:28:41	1.91
***************
*** 1,25 ****
! # Open an arbitrary URL
! #
! # See the following document for more info on URLs:
! # "Names and Addresses, URIs, URLs, URNs, URCs", at
! # http://www.w3.org/pub/WWW/Addressing/Overview.html
! #
! # See also the HTTP spec (from which the error codes are derived):
! # "HTTP - Hypertext Transfer Protocol", at
! # http://www.w3.org/pub/WWW/Protocols/
! #
! # Related standards and specs:
! # - RFC1808: the "relative URL" spec. (authoritative status)
! # - RFC1738 - the "URL standard". (authoritative status)
! # - RFC1630 - the "URI spec". (informational status)
! #
! # The object returned by URLopener().open(file) will differ per
! # protocol.  All you know is that is has methods read(), readline(),
! # readlines(), fileno(), close() and info().  The read*(), fileno()
! # and close() methods work like those of open files. 
! # The info() method returns a mimetools.Message object which can be
! # used to query various info about the object, if available.
! # (mimetools.Message objects are queried with the getheader() method.)
  
  import string
  import socket
--- 1,26 ----
! """Open an arbitrary URL.
  
+ See the following document for more info on URLs:
+ "Names and Addresses, URIs, URLs, URNs, URCs", at
+ http://www.w3.org/pub/WWW/Addressing/Overview.html
+ 
+ See also the HTTP spec (from which the error codes are derived):
+ "HTTP - Hypertext Transfer Protocol", at
+ http://www.w3.org/pub/WWW/Protocols/
+ 
+ Related standards and specs:
+ - RFC1808: the "relative URL" spec. (authoritative status)
+ - RFC1738 - the "URL standard". (authoritative status)
+ - RFC1630 - the "URI spec". (informational status)
+ 
+ The object returned by URLopener().open(file) will differ per
+ protocol.  All you know is that is has methods read(), readline(),
+ readlines(), fileno(), close() and info().  The read*(), fileno()
+ and close() methods work like those of open files. 
+ The info() method returns a mimetools.Message object which can be
+ used to query various info about the object, if available.
+ (mimetools.Message objects are queried with the getheader() method.)
+ """
+ 
  import string
  import socket
***************
*** 70,81 ****
  
  
- # Class to open URLs.
- # This is a class rather than just a subroutine because we may need
- # more than one set of global protocol-specific options.
- # Note -- this is a base class for those who don't want the
- # automatic handling of errors type 302 (relocated) and 401
- # (authorization needed).
  ftpcache = {}
  class URLopener:
  
      __tempfiles = None
--- 71,82 ----
  
  
  ftpcache = {}
  class URLopener:
+     """Class to open URLs.
+     This is a class rather than just a subroutine because we may need
+     more than one set of global protocol-specific options.
+     Note -- this is a base class for those who don't want the
+     automatic handling of errors type 302 (relocated) and 401
+     (authorization needed)."""
  
      __tempfiles = None
***************
*** 126,137 ****
              self.tempcache.clear()
  
-     # Add a header to be used by the HTTP interface only
-     # e.g. u.addheader('Accept', 'sound/basic')
      def addheader(self, *args):
          self.addheaders.append(args)
  
      # External interface
-     # Use URLopener().open(file) instead of open(file, 'r')
      def open(self, fullurl, data=None):
          fullurl = unwrap(fullurl)
          if self.tempcache and self.tempcache.has_key(fullurl):
--- 127,138 ----
              self.tempcache.clear()
  
      def addheader(self, *args):
+         """Add a header to be used by the HTTP interface only
+         e.g. u.addheader('Accept', 'sound/basic')"""
          self.addheaders.append(args)
  
      # External interface
      def open(self, fullurl, data=None):
+         """Use URLopener().open(file) instead of open(file, 'r')."""
          fullurl = unwrap(fullurl)
          if self.tempcache and self.tempcache.has_key(fullurl):
***************
*** 164,176 ****
              raise IOError, ('socket error', msg), sys.exc_info()[2]
  
-     # Overridable interface to open unknown URL type
      def open_unknown(self, fullurl, data=None):
          type, url = splittype(fullurl)
          raise IOError, ('url error', 'unknown url type', type)
  
      # External interface
-     # retrieve(url) returns (filename, None) for a local object
-     # or (tempfilename, headers) for a remote object
      def retrieve(self, url, filename=None, reporthook=None):
          url = unwrap(url)
          if self.tempcache and self.tempcache.has_key(url):
--- 165,177 ----
              raise IOError, ('socket error', msg), sys.exc_info()[2]
  
      def open_unknown(self, fullurl, data=None):
+         """Overridable interface to open unknown URL type."""
          type, url = splittype(fullurl)
          raise IOError, ('url error', 'unknown url type', type)
  
      # External interface
      def retrieve(self, url, filename=None, reporthook=None):
+         """retrieve(url) returns (filename, None) for a local object
+         or (tempfilename, headers) for a remote object."""
          url = unwrap(url)
          if self.tempcache and self.tempcache.has_key(url):
***************
*** 224,229 ****
      # Each method named open_<type> knows how to open that type of URL
  
-     # Use HTTP protocol
      def open_http(self, url, data=None):
          import httplib
          user_passwd = None
--- 225,230 ----
      # Each method named open_<type> knows how to open that type of URL
  
      def open_http(self, url, data=None):
+         """Use HTTP protocol."""
          import httplib
          user_passwd = None
***************
*** 277,284 ****
                  return self.http_error(url, fp, errcode, errmsg, headers, data)
  
-     # Handle http errors.
-     # Derived class can override this, or provide specific handlers
-     # named http_error_DDD where DDD is the 3-digit error code
      def http_error(self, url, fp, errcode, errmsg, headers, data=None):
          # First check if there's a specific handler for this error
          name = 'http_error_%d' % errcode
--- 278,285 ----
                  return self.http_error(url, fp, errcode, errmsg, headers, data)
  
      def http_error(self, url, fp, errcode, errmsg, headers, data=None):
+         """Handle http errors.
+         Derived class can override this, or provide specific handlers
+         named http_error_DDD where DDD is the 3-digit error code."""
          # First check if there's a specific handler for this error
          name = 'http_error_%d' % errcode
***************
*** 292,304 ****
          return self.http_error_default(url, fp, errcode, errmsg, headers)
  
-     # Default http error handler: close the connection and raises IOError
      def http_error_default(self, url, fp, errcode, errmsg, headers):
          void = fp.read()
          fp.close()
          raise IOError, ('http error', errcode, errmsg, headers)
  
-     # Use HTTPS protocol
      if hasattr(socket, "ssl"):
          def open_https(self, url):
              import httplib
              if type(url) is type(""):
--- 293,305 ----
          return self.http_error_default(url, fp, errcode, errmsg, headers)
  
      def http_error_default(self, url, fp, errcode, errmsg, headers):
+         """Default error handler: close the connection and raise IOError."""
          void = fp.read()
          fp.close()
          raise IOError, ('http error', errcode, errmsg, headers)
  
      if hasattr(socket, "ssl"):
          def open_https(self, url):
+             """Use HTTPS protocol."""
              import httplib
              if type(url) is type(""):
***************
*** 334,339 ****
                  return self.http_error(url, fp, errcode, errmsg, headers)
    
-     # Use Gopher protocol
      def open_gopher(self, url):
          import gopherlib
          host, selector = splithost(url)
--- 335,340 ----
                  return self.http_error(url, fp, errcode, errmsg, headers)
    
      def open_gopher(self, url):
+         """Use Gopher protocol."""
          import gopherlib
          host, selector = splithost(url)
***************
*** 350,355 ****
          return addinfourl(fp, noheaders(), "gopher:" + url)
  
-     # Use local file or FTP depending on form of URL
      def open_file(self, url):
          if url[:2] == '//' and url[2:3] != '/':
              return self.open_ftp(url)
--- 351,356 ----
          return addinfourl(fp, noheaders(), "gopher:" + url)
  
      def open_file(self, url):
+         """Use local file or FTP depending on form of URL."""
          if url[:2] == '//' and url[2:3] != '/':
              return self.open_ftp(url)
***************
*** 357,362 ****
              return self.open_local_file(url)
  
-     # Use local file
      def open_local_file(self, url):
          import mimetypes, mimetools, StringIO
          mtype = mimetypes.guess_type(url)[0]
--- 358,363 ----
              return self.open_local_file(url)
  
      def open_local_file(self, url):
+         """Use local file."""
          import mimetypes, mimetools, StringIO
          mtype = mimetypes.guess_type(url)[0]
***************
*** 380,385 ****
          raise IOError, ('local file error', 'not on local host')
  
-     # Use FTP protocol
      def open_ftp(self, url):
          host, path = splithost(url)
          if not host: raise IOError, ('ftp error', 'no host given')
--- 381,386 ----
          raise IOError, ('local file error', 'not on local host')
  
      def open_ftp(self, url):
+         """Use FTP protocol."""
          host, path = splithost(url)
          if not host: raise IOError, ('ftp error', 'no host given')
***************
*** 434,439 ****
              raise IOError, ('ftp error', msg), sys.exc_info()[2]
  
-     # Use "data" URL
      def open_data(self, url, data=None):
          # ignore POSTed data
          #
--- 435,440 ----
              raise IOError, ('ftp error', msg), sys.exc_info()[2]
  
      def open_data(self, url, data=None):
+         """Use "data" URL."""
          # ignore POSTed data
          #
***************
*** 475,480 ****
  
  
- # Derived class with handlers for errors we can handle (perhaps)
  class FancyURLopener(URLopener):
  
      def __init__(self, *args):
--- 476,481 ----
  
  
  class FancyURLopener(URLopener):
+     """Derived class with handlers for errors we can handle (perhaps)."""
  
      def __init__(self, *args):
***************
*** 482,492 ****
          self.auth_cache = {}
  
-     # Default error handling -- don't raise an exception
      def http_error_default(self, url, fp, errcode, errmsg, headers):
          return addinfourl(fp, headers, "http:" + url)
  
!     # Error 302 -- relocated (temporarily)
!     def http_error_302(self, url, fp, errcode, errmsg, headers,
!                data=None): 
          # XXX The server can force infinite recursion here!
          if headers.has_key('location'):
--- 483,492 ----
          self.auth_cache = {}
  
      def http_error_default(self, url, fp, errcode, errmsg, headers):
+         """Default error handling -- don't raise an exception."""
          return addinfourl(fp, headers, "http:" + url)
  
!     def http_error_302(self, url, fp, errcode, errmsg, headers, data=None): 
!         """Error 302 -- relocated (temporarily)."""
          # XXX The server can force infinite recursion here!
          if headers.has_key('location'):
***************
*** 504,516 ****
          else:
              return self.open(newurl, data)
- 
-     # Error 301 -- also relocated (permanently)
-     http_error_301 = http_error_302
  
!     # Error 401 -- authentication required
!     # See this URL for a description of the basic authentication scheme:
!     # http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-v10-spec-00.txt
!     def http_error_401(self, url, fp, errcode, errmsg, headers,
!                data=None): 
          if headers.has_key('www-authenticate'):
              stuff = headers['www-authenticate']
--- 504,516 ----
          else:
              return self.open(newurl, data)
  
!     def http_error_301(self, url, fp, errcode, errmsg, headers, data=None): 
!         """Error 301 -- also relocated (permanently)."""
!         return self.http_error_302(url, fp, errcode, errmsg, headers, data)
! 
!     def http_error_401(self, url, fp, errcode, errmsg, headers, data=None): 
!         """Error 401 -- authentication required.
!         See this URL for a description of the basic authentication scheme:
!         http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-v10-spec-00.txt"""
          if headers.has_key('www-authenticate'):
              stuff = headers['www-authenticate']
***************
*** 561,565 ****
  
      def prompt_user_passwd(self, host, realm):
!         # Override this in a GUI environment!
          import getpass
          try:
--- 561,565 ----
  
      def prompt_user_passwd(self, host, realm):
!         """Override this in a GUI environment!"""
          import getpass
          try:
***************
*** 576,582 ****
  # Utility functions
  
- # Return the IP address of the magic hostname 'localhost'
  _localhost = None
  def localhost():
      global _localhost
      if not _localhost:
--- 576,582 ----
  # Utility functions
  
  _localhost = None
  def localhost():
+     """Return the IP address of the magic hostname 'localhost'."""
      global _localhost
      if not _localhost:
***************
*** 584,590 ****
      return _localhost
  
- # Return the IP address of the current host
  _thishost = None
  def thishost():
      global _thishost
      if not _thishost:
--- 584,590 ----
      return _localhost
  
  _thishost = None
  def thishost():
+     """Return the IP address of the current host."""
      global _thishost
      if not _thishost:
***************
*** 592,598 ****
      return _thishost
  
- # Return the set of errors raised by the FTP class
  _ftperrors = None
  def ftperrors():
      global _ftperrors
      if not _ftperrors:
--- 592,598 ----
      return _thishost
  
  _ftperrors = None
  def ftperrors():
+     """Return the set of errors raised by the FTP class."""
      global _ftperrors
      if not _ftperrors:
***************
*** 601,607 ****
      return _ftperrors
  
- # Return an empty mimetools.Message object
  _noheaders = None
  def noheaders():
      global _noheaders
      if not _noheaders:
--- 601,607 ----
      return _ftperrors
  
  _noheaders = None
  def noheaders():
+     """Return an empty mimetools.Message object."""
      global _noheaders
      if not _noheaders:
***************
*** 615,620 ****
  # Utility classes
  
- # Class used by open_ftp() for cache of open FTP connections
  class ftpwrapper:
      def __init__(self, user, passwd, host, port, dirs):
          self.user = user
--- 615,621 ----
  # Utility classes
  
  class ftpwrapper:
+     """Class used by open_ftp() for cache of open FTP connections."""
+ 
      def __init__(self, user, passwd, host, port, dirs):
          self.user = user
***************
*** 624,627 ****
--- 625,629 ----
          self.dirs = dirs
          self.init()
+ 
      def init(self):
          import ftplib
***************
*** 632,635 ****
--- 634,638 ----
          for dir in self.dirs:
              self.ftp.cwd(dir)
+ 
      def retrfile(self, file, type):
          import ftplib
***************
*** 677,680 ****
--- 680,684 ----
          except ftperrors():
              pass
+ 
      def close(self):
          self.endtransfer()
***************
*** 684,689 ****
              pass
  
- # Base class for addinfo and addclosehook
  class addbase:
      def __init__(self, fp):
          self.fp = fp
--- 688,694 ----
              pass
  
  class addbase:
+     """Base class for addinfo and addclosehook."""
+ 
      def __init__(self, fp):
          self.fp = fp
***************
*** 692,698 ****
--- 697,705 ----
          if hasattr(self.fp, "readlines"): self.readlines = self.fp.readlines
          if hasattr(self.fp, "fileno"): self.fileno = self.fp.fileno
+ 
      def __repr__(self):
          return '<%s at %s whose fp = %s>' % (self.__class__.__name__,
                                               `id(self)`, `self.fp`) 
+ 
      def close(self):
          self.read = None
***************
*** 703,712 ****
          self.fp = None
  
- # Class to add a close hook to an open file
  class addclosehook(addbase):
      def __init__(self, fp, closehook, *hookargs):
          addbase.__init__(self, fp)
          self.closehook = closehook
          self.hookargs = hookargs
      def close(self):
          if self.closehook:
--- 710,721 ----
          self.fp = None
  
  class addclosehook(addbase):
+     """Class to add a close hook to an open file."""
+ 
      def __init__(self, fp, closehook, *hookargs):
          addbase.__init__(self, fp)
          self.closehook = closehook
          self.hookargs = hookargs
+ 
      def close(self):
          if self.closehook:
***************
*** 716,742 ****
          addbase.close(self)
  
- # class to add an info() method to an open file
  class addinfo(addbase):
      def __init__(self, fp, headers):
          addbase.__init__(self, fp)
          self.headers = headers
      def info(self):
          return self.headers
  
- # class to add info() and geturl() methods to an open file
  class addinfourl(addbase):
      def __init__(self, fp, headers, url):
          addbase.__init__(self, fp)
          self.headers = headers
          self.url = url
      def info(self):
          return self.headers
      def geturl(self):
          return self.url
  
  
- # Utility to combine a URL with a base URL to form a new URL
- 
  def basejoin(base, url):
      type, path = splittype(url)
      if type:
--- 725,755 ----
          addbase.close(self)
  
  class addinfo(addbase):
+     """class to add an info() method to an open file."""
+ 
      def __init__(self, fp, headers):
          addbase.__init__(self, fp)
          self.headers = headers
+ 
      def info(self):
          return self.headers
  
  class addinfourl(addbase):
+     """class to add info() and geturl() methods to an open file."""
+ 
      def __init__(self, fp, headers, url):
          addbase.__init__(self, fp)
          self.headers = headers
          self.url = url
+ 
      def info(self):
          return self.headers
+ 
      def geturl(self):
          return self.url
  
  
  def basejoin(base, url):
+     """Utility to combine a URL with a base URL to form a new URL."""
      type, path = splittype(url)
      if type:
***************
*** 810,813 ****
--- 823,827 ----
  
  def unwrap(url):
+     """unwrap('<URL:type://host/path>') --> 'type://host/path'."""
      url = string.strip(url)
      if url[:1] == '<' and url[-1:] == '>':
***************
*** 818,821 ****
--- 832,836 ----
  _typeprog = None
  def splittype(url):
+     """splittype('type:opaquestring') --> 'type', 'opaquestring'."""
      global _typeprog
      if _typeprog is None:
***************
*** 831,834 ****
--- 846,850 ----
  _hostprog = None
  def splithost(url):
+     """splithost('//host[:port]/path') --> 'host[:port]', '/path'."""
      global _hostprog
      if _hostprog is None:
***************
*** 842,845 ****
--- 858,862 ----
  _userprog = None
  def splituser(host):
+     """splituser('user[:passwd]@host[:port]') --> 'user[:passwd]', 'host[:port]'."""
      global _userprog
      if _userprog is None:
***************
*** 853,856 ****
--- 870,874 ----
  _passwdprog = None
  def splitpasswd(user):
+     """splitpasswd('user:passwd') -> 'user', 'passwd'."""
      global _passwdprog
      if _passwdprog is None:
***************
*** 862,867 ****
--- 880,887 ----
      return user, None
  
+ # splittag('/path#tag') --> '/path', 'tag'
  _portprog = None
  def splitport(host):
+     """splitport('host:port') --> 'host', 'port'."""
      global _portprog
      if _portprog is None:
***************
*** 873,882 ****
      return host, None
  
- # Split host and port, returning numeric port.
- # Return given default port if no ':' found; defaults to -1.
- # Return numerical port if a valid number are found after ':'.
- # Return None if ':' but not a valid number.
  _nportprog = None
  def splitnport(host, defport=-1):
      global _nportprog
      if _nportprog is None:
--- 893,902 ----
      return host, None
  
  _nportprog = None
  def splitnport(host, defport=-1):
+     """Split host and port, returning numeric port.
+     Return given default port if no ':' found; defaults to -1.
+     Return numerical port if a valid number are found after ':'.
+     Return None if ':' but not a valid number."""
      global _nportprog
      if _nportprog is None:
***************
*** 897,900 ****
--- 917,921 ----
  _queryprog = None
  def splitquery(url):
+     """splitquery('/path?query') --> '/path', 'query'."""
      global _queryprog
      if _queryprog is None:
***************
*** 908,911 ****
--- 929,933 ----
  _tagprog = None
  def splittag(url):
+     """splittag('/path#tag') --> '/path', 'tag'."""
      global _tagprog
      if _tagprog is None:
***************
*** 918,921 ****
--- 940,945 ----
  
  def splitattr(url):
+     """splitattr('/path;attr1=value1;attr2=value2;...') ->
+         '/path', ['attr1=value1', 'attr2=value2', ...]."""
      words = string.splitfields(url, ';')
      return words[0], words[1:]
***************
*** 923,926 ****
--- 947,951 ----
  _valueprog = None
  def splitvalue(attr):
+     """splitvalue('attr=value') --> 'attr', 'value'."""
      global _valueprog
      if _valueprog is None:
***************
*** 933,936 ****
--- 958,962 ----
  
  def splitgophertype(selector):
+     """splitgophertype('/Xselector') --> 'X', 'selector'."""
      if selector[:1] == '/' and selector[1:2]:
          return selector[1], selector[2:]
***************
*** 938,941 ****
--- 964,968 ----
  
  def unquote(s):
+     """unquote('abc%20def') -> 'abc def'."""
      mychr = chr
      myatoi = string.atoi
***************
*** 963,966 ****
--- 990,994 ----
  always_safe = string.letters + string.digits + '_,.-'
  def quote(s, safe = '/'):
+     """quote('abc def') -> 'abc%20def')."""
      # XXX Can speed this up an order of magnitude
      safe = always_safe + safe
***************
*** 984,993 ****
  
  def urlencode(dict):
!      l = []
!      for k, v in dict.items():
!          k = quote_plus(str(k))
!          v = quote_plus(str(v))
!          l.append(k + '=' + v)
!      return string.join(l, '&')
  
  
--- 1012,1022 ----
  
  def urlencode(dict):
!     """Encode a dictionary of form entries into a URL query string."""
!     l = []
!     for k, v in dict.items():
!         k = quote_plus(str(k))
!         v = quote_plus(str(v))
!         l.append(k + '=' + v)
!     return string.join(l, '&')
  
  

Index: urllib2.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/urllib2.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** urllib2.py	2000/01/20 18:19:08	1.1
--- urllib2.py	2000/02/04 15:28:42	1.2
***************
*** 1,3 ****
! """An extensible library for opening URLs using a variety protocols
  
  The simplest way to use this module is to call the urlopen function,
--- 1,3 ----
! """An extensible library for opening URLs using a variety of protocols
  
  The simplest way to use this module is to call the urlopen function,

Index: urlparse.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/urlparse.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** urlparse.py	1999/05/03 18:16:23	1.21
--- urlparse.py	2000/02/04 15:28:42	1.22
***************
*** 1,5 ****
! # Parse (absolute and relative) URLs.  See RFC 1808: "Relative Uniform
! # Resource Locators", by R. Fielding, UC Irvine, June 1995.
  
  # Standard/builtin Python modules
  import string
--- 1,8 ----
! """Parse (absolute and relative) URLs.
  
+ See RFC 1808: "Relative Uniform Resource Locators", by R. Fielding,
+ UC Irvine, June 1995.
+ """
+ 
  # Standard/builtin Python modules
  import string
***************
*** 40,49 ****
  
  
- # Parse a URL into 6 components:
- # <scheme>://<netloc>/<path>;<params>?<query>#<fragment>
- # Return a 6-tuple: (scheme, netloc, path, params, query, fragment).
- # Note that we don't break the components up in smaller bits
- # (e.g. netloc is a single string) and we don't expand % escapes.
  def urlparse(url, scheme = '', allow_fragments = 1):
  	key = url, scheme, allow_fragments
  	cached = _parse_cache.get(key, None)
--- 43,52 ----
  
  
  def urlparse(url, scheme = '', allow_fragments = 1):
+ 	"""Parse a URL into 6 components:
+ 	<scheme>://<netloc>/<path>;<params>?<query>#<fragment>
+ 	Return a 6-tuple: (scheme, netloc, path, params, query, fragment).
+ 	Note that we don't break the components up in smaller bits
+ 	(e.g. netloc is a single string) and we don't expand % escapes."""
  	key = url, scheme, allow_fragments
  	cached = _parse_cache.get(key, None)
***************
*** 108,116 ****
  	return tuple
  
- # Put a parsed URL back together again.  This may result in a slightly
- # different, but equivalent URL, if the URL that was parsed originally
- # had redundant delimiters, e.g. a ? with an empty query (the draft
- # states that these are equivalent).
  def urlunparse((scheme, netloc, url, params, query, fragment)):
  	if netloc or (scheme in uses_netloc and url[:2] == '//'):
  		if url[:1] != '/': url = '/' + url
--- 111,119 ----
  	return tuple
  
  def urlunparse((scheme, netloc, url, params, query, fragment)):
+ 	"""Put a parsed URL back together again.  This may result in a
+ 	slightly different, but equivalent URL, if the URL that was parsed
+ 	originally had redundant delimiters, e.g. a ? with an empty query
+ 	(the draft states that these are equivalent)."""
  	if netloc or (scheme in uses_netloc and url[:2] == '//'):
  		if url[:1] != '/': url = '/' + url
***************
*** 126,132 ****
  	return url
  
- # Join a base URL and a possibly relative URL to form an absolute
- # interpretation of the latter.
  def urljoin(base, url, allow_fragments = 1):
  	if not base:
  		return url
--- 129,135 ----
  	return url
  
  def urljoin(base, url, allow_fragments = 1):
+ 	"""Join a base URL and a possibly relative URL to form an absolute
+ 	interpretation of the latter."""
  	if not base:
  		return url

Index: uu.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/uu.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** uu.py	1999/01/05 18:02:24	1.10
--- uu.py	2000/02/04 15:28:42	1.11
***************
*** 24,32 ****
  #   version is still 5 times faster, though.
  # - Arguments more compliant with python standard
- #
- # This file implements the UUencode and UUdecode functions.
  
! # encode(in_file, out_file [,name, mode])
! # decode(in_file [, out_file, mode])
  
  import binascii
--- 24,33 ----
  #   version is still 5 times faster, though.
  # - Arguments more compliant with python standard
  
! """Implementation of the UUencode and UUdecode functions.
! 
! encode(in_file, out_file [,name, mode])
! decode(in_file [, out_file, mode])
! """
  
  import binascii

Index: wave.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/wave.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** wave.py	1999/08/26 15:50:43	1.8
--- wave.py	2000/02/04 15:28:42	1.9
***************
*** 1,74 ****
! # Stuff to parse WAVE files.
! #
! # Usage.
! #
! # Reading WAVE files:
! #	f = wave.open(file, 'r')
! # where file is either the name of a file or an open file pointer.
! # The open file pointer must have methods read(), seek(), and close().
! # When the setpos() and rewind() methods are not used, the seek()
! # method is not  necessary.
! #
! # This returns an instance of a class with the following public methods:
! #	getnchannels()	-- returns number of audio channels (1 for
! #			   mono, 2 for stereo)
! #	getsampwidth()	-- returns sample width in bytes
! #	getframerate()	-- returns sampling frequency
! #	getnframes()	-- returns number of audio frames
! #	getcomptype()	-- returns compression type ('NONE' for linear samples)
! #	getcompname()	-- returns human-readable version of
! #			   compression type ('not compressed' linear samples)
! #	getparams()	-- returns a tuple consisting of all of the
! #			   above in the above order
! #	getmarkers()	-- returns None (for compatibility with the
! #			   aifc module)
! #	getmark(id)	-- raises an error since the mark does not
! #			   exist (for compatibility with the aifc module)
! #	readframes(n)	-- returns at most n frames of audio
! #	rewind()	-- rewind to the beginning of the audio stream
! #	setpos(pos)	-- seek to the specified position
! #	tell()		-- return the current position
! #	close()		-- close the instance (make it unusable)
! # The position returned by tell() and the position given to setpos()
! # are compatible and have nothing to do with the actual postion in the
! # file.
! # The close() method is called automatically when the class instance
! # is destroyed.
! #
! # Writing WAVE files:
! #	f = wave.open(file, 'w')
! # where file is either the name of a file or an open file pointer.
! # The open file pointer must have methods write(), tell(), seek(), and
! # close().
! #
! # This returns an instance of a class with the following public methods:
! #	setnchannels(n)	-- set the number of channels
! #	setsampwidth(n)	-- set the sample width
! #	setframerate(n)	-- set the frame rate
! #	setnframes(n)	-- set the number of frames
! #	setcomptype(type, name)
! #			-- set the compression type and the
! #			   human-readable compression type
! #	setparams(tuple)
! #			-- set all parameters at once
! #	tell()		-- return current position in output file
! #	writeframesraw(data)
! #			-- write audio frames without pathing up the
! #			   file header
! #	writeframes(data)
! #			-- write audio frames and patch up the file header
! #	close()		-- patch up the file header and close the
! #			   output file
! # You should set the parameters before the first writeframesraw or
! # writeframes.  The total number of frames does not need to be set,
! # but when it is set to the correct value, the header does not have to
! # be patched up.
! # It is best to first set all parameters, perhaps possibly the
! # compression type, and then write audio frames using writeframesraw.
! # When all frames have been written, either call writeframes('') or
! # close() to patch up the sizes in the header.
! # The close() method is called automatically when the class instance
! # is destroyed.
  
  import __builtin__
  
--- 1,75 ----
! """Stuff to parse WAVE files.
  
+ Usage.
+ 
+ Reading WAVE files:
+       f = wave.open(file, 'r')
+ where file is either the name of a file or an open file pointer.
+ The open file pointer must have methods read(), seek(), and close().
+ When the setpos() and rewind() methods are not used, the seek()
+ method is not  necessary.
+ 
+ This returns an instance of a class with the following public methods:
+       getnchannels()  -- returns number of audio channels (1 for
+                          mono, 2 for stereo)
+       getsampwidth()  -- returns sample width in bytes
+       getframerate()  -- returns sampling frequency
+       getnframes()    -- returns number of audio frames
+       getcomptype()   -- returns compression type ('NONE' for linear samples)
+       getcompname()   -- returns human-readable version of
+                          compression type ('not compressed' linear samples)
+       getparams()     -- returns a tuple consisting of all of the
+                          above in the above order
+       getmarkers()    -- returns None (for compatibility with the
+                          aifc module)
+       getmark(id)     -- raises an error since the mark does not
+                          exist (for compatibility with the aifc module)
+       readframes(n)   -- returns at most n frames of audio
+       rewind()        -- rewind to the beginning of the audio stream
+       setpos(pos)     -- seek to the specified position
+       tell()          -- return the current position
+       close()         -- close the instance (make it unusable)
+ The position returned by tell() and the position given to setpos()
+ are compatible and have nothing to do with the actual postion in the
+ file.
+ The close() method is called automatically when the class instance
+ is destroyed.
+ 
+ Writing WAVE files:
+       f = wave.open(file, 'w')
+ where file is either the name of a file or an open file pointer.
+ The open file pointer must have methods write(), tell(), seek(), and
+ close().
+ 
+ This returns an instance of a class with the following public methods:
+       setnchannels(n) -- set the number of channels
+       setsampwidth(n) -- set the sample width
+       setframerate(n) -- set the frame rate
+       setnframes(n)   -- set the number of frames
+       setcomptype(type, name)
+                       -- set the compression type and the
+                          human-readable compression type
+       setparams(tuple)
+                       -- set all parameters at once
+       tell()          -- return current position in output file
+       writeframesraw(data)
+                       -- write audio frames without pathing up the
+                          file header
+       writeframes(data)
+                       -- write audio frames and patch up the file header
+       close()         -- patch up the file header and close the
+                          output file
+ You should set the parameters before the first writeframesraw or
+ writeframes.  The total number of frames does not need to be set,
+ but when it is set to the correct value, the header does not have to
+ be patched up.
+ It is best to first set all parameters, perhaps possibly the
+ compression type, and then write audio frames using writeframesraw.
+ When all frames have been written, either call writeframes('') or
+ close() to patch up the sizes in the header.
+ The close() method is called automatically when the class instance
+ is destroyed.
+ """
+ 
  import __builtin__
  
***************
*** 82,471 ****
  import struct
  if struct.pack("h", 1) == "\000\001":
! 	big_endian = 1
  else:
! 	big_endian = 0
  
  from chunk import Chunk
  
  class Wave_read:
! 	# Variables used in this class:
! 	#
! 	# These variables are available to the user though appropriate
! 	# methods of this class:
! 	# _file -- the open file with methods read(), close(), and seek()
! 	#		set through the __init__() method
! 	# _nchannels -- the number of audio channels
! 	#		available through the getnchannels() method
! 	# _nframes -- the number of audio frames
! 	#		available through the getnframes() method
! 	# _sampwidth -- the number of bytes per audio sample
! 	#		available through the getsampwidth() method
! 	# _framerate -- the sampling frequency
! 	#		available through the getframerate() method
! 	# _comptype -- the AIFF-C compression type ('NONE' if AIFF)
! 	#		available through the getcomptype() method
! 	# _compname -- the human-readable AIFF-C compression type
! 	#		available through the getcomptype() method
! 	# _soundpos -- the position in the audio stream
! 	#		available through the tell() method, set through the
! 	#		setpos() method
! 	#
! 	# These variables are used internally only:
! 	# _fmt_chunk_read -- 1 iff the FMT chunk has been read
! 	# _data_seek_needed -- 1 iff positioned correctly in audio
! 	#		file for readframes()
! 	# _data_chunk -- instantiation of a chunk class for the DATA chunk
! 	# _framesize -- size of one frame in the file
! 
! 	def initfp(self, file):
! 		self._convert = None
! 		self._soundpos = 0
! 		self._file = Chunk(file, bigendian = 0)
! 		if self._file.getname() != 'RIFF':
! 			raise Error, 'file does not start with RIFF id'
! 		if self._file.read(4) != 'WAVE':
! 			raise Error, 'not a WAVE file'
! 		self._fmt_chunk_read = 0
! 		self._data_chunk = None
! 		while 1:
! 			self._data_seek_needed = 1
! 			try:
! 				chunk = Chunk(self._file, bigendian = 0)
! 			except EOFError:
! 				break
! 			chunkname = chunk.getname()
! 			if chunkname == 'fmt ':
! 				self._read_fmt_chunk(chunk)
! 				self._fmt_chunk_read = 1
! 			elif chunkname == 'data':
! 				if not self._fmt_chunk_read:
! 					raise Error, 'data chunk before fmt chunk'
! 				self._data_chunk = chunk
! 				self._nframes = chunk.chunksize / self._framesize
! 				self._data_seek_needed = 0
! 				break
! 			chunk.skip()
! 		if not self._fmt_chunk_read or not self._data_chunk:
! 			raise Error, 'fmt chunk and/or data chunk missing'
! 
! 	def __init__(self, f):
! 		if type(f) == type(''):
! 			f = __builtin__.open(f, 'rb')
! 		# else, assume it is an open file object already
! 		self.initfp(f)
! 
! 	#
! 	# User visible methods.
! 	#
! 	def getfp(self):
! 		return self._file
! 
! 	def rewind(self):
! 		self._data_seek_needed = 1
! 		self._soundpos = 0
! 
! 	def close(self):
! 		self._file = None
! 
! 	def tell(self):
! 		return self._soundpos
! 
! 	def getnchannels(self):
! 		return self._nchannels
! 
! 	def getnframes(self):
! 		return self._nframes
! 
! 	def getsampwidth(self):
! 		return self._sampwidth
! 
! 	def getframerate(self):
! 		return self._framerate
! 
! 	def getcomptype(self):
! 		return self._comptype
! 
! 	def getcompname(self):
! 		return self._compname
! 
! 	def getparams(self):
! 		return self.getnchannels(), self.getsampwidth(), \
! 			  self.getframerate(), self.getnframes(), \
! 			  self.getcomptype(), self.getcompname()
! 
! 	def getmarkers(self):
! 		return None
! 
! 	def getmark(self, id):
! 		raise Error, 'no marks'
! 
! 	def setpos(self, pos):
! 		if pos < 0 or pos > self._nframes:
! 			raise Error, 'position not in range'
! 		self._soundpos = pos
! 		self._data_seek_needed = 1
! 
! 	def readframes(self, nframes):
! 		if self._data_seek_needed:
! 			self._data_chunk.seek(0, 0)
! 			pos = self._soundpos * self._framesize
! 			if pos:
! 				self._data_chunk.seek(pos, 0)
! 			self._data_seek_needed = 0
! 		if nframes == 0:
! 			return ''
! 		if self._sampwidth > 1 and big_endian:
! 			# unfortunately the fromfile() method does not take
! 			# something that only looks like a file object, so
! 			# we have to reach into the innards of the chunk object
! 			import array
! 			chunk = self._data_chunk
! 			data = array.array(_array_fmts[self._sampwidth])
! 			nitems = nframes * self._nchannels
! 			if nitems * self._sampwidth > chunk.chunksize - chunk.size_read:
! 				nitems = (chunk.chunksize - chunk.size_read) / self._sampwidth
! 			data.fromfile(chunk.file.file, nitems)
! 			# "tell" data chunk how much was read
! 			chunk.size_read = chunk.size_read + nitems * self._sampwidth
! 			# do the same for the outermost chunk
! 			chunk = chunk.file
! 			chunk.size_read = chunk.size_read + nitems * self._sampwidth
! 			data.byteswap()
! 			data = data.tostring()
! 		else:
! 			data = self._data_chunk.read(nframes * self._framesize)
! 		if self._convert and data:
! 			data = self._convert(data)
! 		self._soundpos = self._soundpos + len(data) / (self._nchannels * self._sampwidth)
! 		return data
! 
! 	#
! 	# Internal methods.
! 	#
! 
! 	def _read_fmt_chunk(self, chunk):
! 		wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack('<hhllh', chunk.read(14))
! 		if wFormatTag == WAVE_FORMAT_PCM:
! 			sampwidth = struct.unpack('<h', chunk.read(2))[0]
! 			self._sampwidth = (sampwidth + 7) / 8
! 		else:
! 			raise Error, 'unknown format: ' + `wFormatTag`
! 		self._framesize = self._nchannels * self._sampwidth
! 		self._comptype = 'NONE'
! 		self._compname = 'not compressed'
  
  class Wave_write:
! 	# Variables used in this class:
! 	#
! 	# These variables are user settable through appropriate methods
! 	# of this class:
! 	# _file -- the open file with methods write(), close(), tell(), seek()
! 	#		set through the __init__() method
! 	# _comptype -- the AIFF-C compression type ('NONE' in AIFF)
! 	#		set through the setcomptype() or setparams() method
! 	# _compname -- the human-readable AIFF-C compression type
! 	#		set through the setcomptype() or setparams() method
! 	# _nchannels -- the number of audio channels
! 	#		set through the setnchannels() or setparams() method
! 	# _sampwidth -- the number of bytes per audio sample
! 	#		set through the setsampwidth() or setparams() method
! 	# _framerate -- the sampling frequency
! 	#		set through the setframerate() or setparams() method
! 	# _nframes -- the number of audio frames written to the header
! 	#		set through the setnframes() or setparams() method
! 	#
! 	# These variables are used internally only:
! 	# _datalength -- the size of the audio samples written to the header
! 	# _nframeswritten -- the number of frames actually written
! 	# _datawritten -- the size of the audio samples actually written
! 
! 	def __init__(self, f):
! 		if type(f) == type(''):
! 			f = __builtin__.open(f, 'wb')
! 		self.initfp(f)
! 
! 	def initfp(self, file):
! 		self._file = file
! 		self._convert = None
! 		self._nchannels = 0
! 		self._sampwidth = 0
! 		self._framerate = 0
! 		self._nframes = 0
! 		self._nframeswritten = 0
! 		self._datawritten = 0
! 		self._datalength = 0
! 
! 	def __del__(self):
! 		if self._file:
! 			self.close()
! 
! 	#
! 	# User visible methods.
! 	#
! 	def setnchannels(self, nchannels):
! 		if self._datawritten:
! 			raise Error, 'cannot change parameters after starting to write'
! 		if nchannels < 1:
! 			raise Error, 'bad # of channels'
! 		self._nchannels = nchannels
! 
! 	def getnchannels(self):
! 		if not self._nchannels:
! 			raise Error, 'number of channels not set'
! 		return self._nchannels
! 
! 	def setsampwidth(self, sampwidth):
! 		if self._datawritten:
! 			raise Error, 'cannot change parameters after starting to write'
! 		if sampwidth < 1 or sampwidth > 4:
! 			raise Error, 'bad sample width'
! 		self._sampwidth = sampwidth
! 
! 	def getsampwidth(self):
! 		if not self._sampwidth:
! 			raise Error, 'sample width not set'
! 		return self._sampwidth
! 
! 	def setframerate(self, framerate):
! 		if self._datawritten:
! 			raise Error, 'cannot change parameters after starting to write'
! 		if framerate <= 0:
! 			raise Error, 'bad frame rate'
! 		self._framerate = framerate
! 
! 	def getframerate(self):
! 		if not self._framerate:
! 			raise Error, 'frame rate not set'
! 		return self._framerate
! 
! 	def setnframes(self, nframes):
! 		if self._datawritten:
! 			raise Error, 'cannot change parameters after starting to write'
! 		self._nframes = nframes
! 
! 	def getnframes(self):
! 		return self._nframeswritten
! 
! 	def setcomptype(self, comptype, compname):
! 		if self._datawritten:
! 			raise Error, 'cannot change parameters after starting to write'
! 		if comptype not in ('NONE',):
! 			raise Error, 'unsupported compression type'
! 		self._comptype = comptype
! 		self._compname = compname
! 
! 	def getcomptype(self):
! 		return self._comptype
! 
! 	def getcompname(self):
! 		return self._compname
! 
! 	def setparams(self, (nchannels, sampwidth, framerate, nframes, comptype, compname)):
! 		if self._datawritten:
! 			raise Error, 'cannot change parameters after starting to write'
! 		self.setnchannels(nchannels)
! 		self.setsampwidth(sampwidth)
! 		self.setframerate(framerate)
! 		self.setnframes(nframes)
! 		self.setcomptype(comptype, compname)
! 
! 	def getparams(self):
! 		if not self._nchannels or not self._sampwidth or not self._framerate:
! 			raise Error, 'not all parameters set'
! 		return self._nchannels, self._sampwidth, self._framerate, \
! 			  self._nframes, self._comptype, self._compname
! 
! 	def setmark(self, id, pos, name):
! 		raise Error, 'setmark() not supported'
! 
! 	def getmark(self, id):
! 		raise Error, 'no marks'
! 
! 	def getmarkers(self):
! 		return None
! 				
! 	def tell(self):
! 		return self._nframeswritten
! 
! 	def writeframesraw(self, data):
! 		self._ensure_header_written(len(data))
! 		nframes = len(data) / (self._sampwidth * self._nchannels)
! 		if self._convert:
! 			data = self._convert(data)
! 		if self._sampwidth > 1 and big_endian:
! 			import array
! 			data = array.array(_array_fmts[self._sampwidth], data)
! 			data.byteswap()
! 			data.tofile(self._file)
! 			self._datawritten = self._datawritten + len(data) * self._sampwidth
! 		else:
! 			self._file.write(data)
! 			self._datawritten = self._datawritten + len(data)
! 		self._nframeswritten = self._nframeswritten + nframes
! 
! 	def writeframes(self, data):
! 		self.writeframesraw(data)
! 		if self._datalength != self._datawritten:
! 			self._patchheader()
! 
! 	def close(self):
! 		self._ensure_header_written(0)
! 		if self._datalength != self._datawritten:
! 			self._patchheader()
! 		self._file.flush()
! 		self._file = None
! 
! 	#
! 	# Internal methods.
! 	#
! 
! 	def _ensure_header_written(self, datasize):
! 		if not self._datawritten:
! 			if not self._nchannels:
! 				raise Error, '# channels not specified'
! 			if not self._sampwidth:
! 				raise Error, 'sample width not specified'
! 			if not self._framerate:
! 				raise Error, 'sampling rate not specified'
! 			self._write_header(datasize)
! 
! 	def _write_header(self, initlength):
! 		self._file.write('RIFF')
! 		if not self._nframes:
! 			self._nframes = initlength / (self._nchannels * self._sampwidth)
! 		self._datalength = self._nframes * self._nchannels * self._sampwidth
! 		self._form_length_pos = self._file.tell()
! 		self._file.write(struct.pack('<lsslhhllhhs',
! 			36 + self._datalength, 'WAVE', 'fmt ', 16,
! 			WAVE_FORMAT_PCM, self._nchannels, self._framerate,
! 			self._nchannels * self._framerate * self._sampwidth,
! 			self._nchannels * self._sampwidth,
! 			self._sampwidth * 8, 'data'))
! 		self._data_length_pos = self._file.tell()
! 		self._file.write(struct.pack('<l', self._datalength))
! 
! 	def _patchheader(self):
! 		if self._datawritten == self._datalength:
! 			return
! 		curpos = self._file.tell()
! 		self._file.seek(self._form_length_pos, 0)
! 		self._file.write(struct.pack('<l', 36 + self._datawritten))
! 		self._file.seek(self._data_length_pos, 0)
! 		self._file.write(struct.pack('<l', self._datawritten))
! 		self._file.seek(curpos, 0)
! 		self._datalength = self._datawritten
  
  def open(f, mode=None):
! 	if mode is None:
! 		if hasattr(f, 'mode'):
! 			mode = f.mode
! 		else:
! 			mode = 'rb'
! 	if mode in ('r', 'rb'):
! 		return Wave_read(f)
! 	elif mode in ('w', 'wb'):
! 		return Wave_write(f)
! 	else:
! 		raise Error, "mode must be 'r', 'rb', 'w', or 'wb'"
  
  openfp = open # B/W compatibility
--- 83,474 ----
  import struct
  if struct.pack("h", 1) == "\000\001":
!     big_endian = 1
  else:
!     big_endian = 0
  
  from chunk import Chunk
  
  class Wave_read:
!     """Variables used in this class:
  
+     These variables are available to the user though appropriate
+     methods of this class:
+     _file -- the open file with methods read(), close(), and seek()
+               set through the __init__() method
+     _nchannels -- the number of audio channels
+               available through the getnchannels() method
+     _nframes -- the number of audio frames
+               available through the getnframes() method
+     _sampwidth -- the number of bytes per audio sample
+               available through the getsampwidth() method
+     _framerate -- the sampling frequency
+               available through the getframerate() method
+     _comptype -- the AIFF-C compression type ('NONE' if AIFF)
+               available through the getcomptype() method
+     _compname -- the human-readable AIFF-C compression type
+               available through the getcomptype() method
+     _soundpos -- the position in the audio stream
+               available through the tell() method, set through the
+               setpos() method
+ 
+     These variables are used internally only:
+     _fmt_chunk_read -- 1 iff the FMT chunk has been read
+     _data_seek_needed -- 1 iff positioned correctly in audio
+               file for readframes()
+     _data_chunk -- instantiation of a chunk class for the DATA chunk
+     _framesize -- size of one frame in the file
+     """
+ 
+     def initfp(self, file):
+         self._convert = None
+         self._soundpos = 0
+         self._file = Chunk(file, bigendian = 0)
+         if self._file.getname() != 'RIFF':
+             raise Error, 'file does not start with RIFF id'
+         if self._file.read(4) != 'WAVE':
+             raise Error, 'not a WAVE file'
+         self._fmt_chunk_read = 0
+         self._data_chunk = None
+         while 1:
+             self._data_seek_needed = 1
+             try:
+                 chunk = Chunk(self._file, bigendian = 0)
+             except EOFError:
+                 break
+             chunkname = chunk.getname()
+             if chunkname == 'fmt ':
+                 self._read_fmt_chunk(chunk)
+                 self._fmt_chunk_read = 1
+             elif chunkname == 'data':
+                 if not self._fmt_chunk_read:
+                     raise Error, 'data chunk before fmt chunk'
+                 self._data_chunk = chunk
+                 self._nframes = chunk.chunksize / self._framesize
+                 self._data_seek_needed = 0
+                 break
+             chunk.skip()
+         if not self._fmt_chunk_read or not self._data_chunk:
+             raise Error, 'fmt chunk and/or data chunk missing'
+ 
+     def __init__(self, f):
+         if type(f) == type(''):
+             f = __builtin__.open(f, 'rb')
+         # else, assume it is an open file object already
+         self.initfp(f)
+ 
+     #
+     # User visible methods.
+     #
+     def getfp(self):
+         return self._file
+ 
+     def rewind(self):
+         self._data_seek_needed = 1
+         self._soundpos = 0
+ 
+     def close(self):
+         self._file = None
+ 
+     def tell(self):
+         return self._soundpos
+ 
+     def getnchannels(self):
+         return self._nchannels
+ 
+     def getnframes(self):
+         return self._nframes
+ 
+     def getsampwidth(self):
+         return self._sampwidth
+ 
+     def getframerate(self):
+         return self._framerate
+ 
+     def getcomptype(self):
+         return self._comptype
+ 
+     def getcompname(self):
+         return self._compname
+ 
+     def getparams(self):
+         return self.getnchannels(), self.getsampwidth(), \
+                self.getframerate(), self.getnframes(), \
+                self.getcomptype(), self.getcompname()
+ 
+     def getmarkers(self):
+         return None
+ 
+     def getmark(self, id):
+         raise Error, 'no marks'
+ 
+     def setpos(self, pos):
+         if pos < 0 or pos > self._nframes:
+             raise Error, 'position not in range'
+         self._soundpos = pos
+         self._data_seek_needed = 1
+ 
+     def readframes(self, nframes):
+         if self._data_seek_needed:
+             self._data_chunk.seek(0, 0)
+             pos = self._soundpos * self._framesize
+             if pos:
+                 self._data_chunk.seek(pos, 0)
+             self._data_seek_needed = 0
+         if nframes == 0:
+             return ''
+         if self._sampwidth > 1 and big_endian:
+             # unfortunately the fromfile() method does not take
+             # something that only looks like a file object, so
+             # we have to reach into the innards of the chunk object
+             import array
+             chunk = self._data_chunk
+             data = array.array(_array_fmts[self._sampwidth])
+             nitems = nframes * self._nchannels
+             if nitems * self._sampwidth > chunk.chunksize - chunk.size_read:
+                 nitems = (chunk.chunksize - chunk.size_read) / self._sampwidth
+             data.fromfile(chunk.file.file, nitems)
+             # "tell" data chunk how much was read
+             chunk.size_read = chunk.size_read + nitems * self._sampwidth
+             # do the same for the outermost chunk
+             chunk = chunk.file
+             chunk.size_read = chunk.size_read + nitems * self._sampwidth
+             data.byteswap()
+             data = data.tostring()
+         else:
+             data = self._data_chunk.read(nframes * self._framesize)
+         if self._convert and data:
+             data = self._convert(data)
+         self._soundpos = self._soundpos + len(data) / (self._nchannels * self._sampwidth)
+         return data
+ 
+     #
+     # Internal methods.
+     #
+ 
+     def _read_fmt_chunk(self, chunk):
+         wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack('<hhllh', chunk.read(14))
+         if wFormatTag == WAVE_FORMAT_PCM:
+             sampwidth = struct.unpack('<h', chunk.read(2))[0]
+             self._sampwidth = (sampwidth + 7) / 8
+         else:
+             raise Error, 'unknown format: ' + `wFormatTag`
+         self._framesize = self._nchannels * self._sampwidth
+         self._comptype = 'NONE'
+         self._compname = 'not compressed'
+ 
  class Wave_write:
!     """Variables used in this class:
! 
!     These variables are user settable through appropriate methods
!     of this class:
!     _file -- the open file with methods write(), close(), tell(), seek()
!               set through the __init__() method
!     _comptype -- the AIFF-C compression type ('NONE' in AIFF)
!               set through the setcomptype() or setparams() method
!     _compname -- the human-readable AIFF-C compression type
!               set through the setcomptype() or setparams() method
!     _nchannels -- the number of audio channels
!               set through the setnchannels() or setparams() method
!     _sampwidth -- the number of bytes per audio sample
!               set through the setsampwidth() or setparams() method
!     _framerate -- the sampling frequency
!               set through the setframerate() or setparams() method
!     _nframes -- the number of audio frames written to the header
!               set through the setnframes() or setparams() method
! 
!     These variables are used internally only:
!     _datalength -- the size of the audio samples written to the header
!     _nframeswritten -- the number of frames actually written
!     _datawritten -- the size of the audio samples actually written
!     """
! 
!     def __init__(self, f):
!         if type(f) == type(''):
!             f = __builtin__.open(f, 'wb')
!         self.initfp(f)
! 
!     def initfp(self, file):
!         self._file = file
!         self._convert = None
!         self._nchannels = 0
!         self._sampwidth = 0
!         self._framerate = 0
!         self._nframes = 0
!         self._nframeswritten = 0
!         self._datawritten = 0
!         self._datalength = 0
! 
!     def __del__(self):
!         if self._file:
!             self.close()
! 
!     #
!     # User visible methods.
!     #
!     def setnchannels(self, nchannels):
!         if self._datawritten:
!             raise Error, 'cannot change parameters after starting to write'
!         if nchannels < 1:
!             raise Error, 'bad # of channels'
!         self._nchannels = nchannels
! 
!     def getnchannels(self):
!         if not self._nchannels:
!             raise Error, 'number of channels not set'
!         return self._nchannels
! 
!     def setsampwidth(self, sampwidth):
!         if self._datawritten:
!             raise Error, 'cannot change parameters after starting to write'
!         if sampwidth < 1 or sampwidth > 4:
!             raise Error, 'bad sample width'
!         self._sampwidth = sampwidth
! 
!     def getsampwidth(self):
!         if not self._sampwidth:
!             raise Error, 'sample width not set'
!         return self._sampwidth
! 
!     def setframerate(self, framerate):
!         if self._datawritten:
!             raise Error, 'cannot change parameters after starting to write'
!         if framerate <= 0:
!             raise Error, 'bad frame rate'
!         self._framerate = framerate
! 
!     def getframerate(self):
!         if not self._framerate:
!             raise Error, 'frame rate not set'
!         return self._framerate
! 
!     def setnframes(self, nframes):
!         if self._datawritten:
!             raise Error, 'cannot change parameters after starting to write'
!         self._nframes = nframes
! 
!     def getnframes(self):
!         return self._nframeswritten
! 
!     def setcomptype(self, comptype, compname):
!         if self._datawritten:
!             raise Error, 'cannot change parameters after starting to write'
!         if comptype not in ('NONE',):
!             raise Error, 'unsupported compression type'
!         self._comptype = comptype
!         self._compname = compname
! 
!     def getcomptype(self):
!         return self._comptype
! 
!     def getcompname(self):
!         return self._compname
! 
!     def setparams(self, (nchannels, sampwidth, framerate, nframes, comptype, compname)):
!         if self._datawritten:
!             raise Error, 'cannot change parameters after starting to write'
!         self.setnchannels(nchannels)
!         self.setsampwidth(sampwidth)
!         self.setframerate(framerate)
!         self.setnframes(nframes)
!         self.setcomptype(comptype, compname)
! 
!     def getparams(self):
!         if not self._nchannels or not self._sampwidth or not self._framerate:
!             raise Error, 'not all parameters set'
!         return self._nchannels, self._sampwidth, self._framerate, \
!               self._nframes, self._comptype, self._compname
! 
!     def setmark(self, id, pos, name):
!         raise Error, 'setmark() not supported'
! 
!     def getmark(self, id):
!         raise Error, 'no marks'
! 
!     def getmarkers(self):
!         return None
!                 
!     def tell(self):
!         return self._nframeswritten
! 
!     def writeframesraw(self, data):
!         self._ensure_header_written(len(data))
!         nframes = len(data) / (self._sampwidth * self._nchannels)
!         if self._convert:
!             data = self._convert(data)
!         if self._sampwidth > 1 and big_endian:
!             import array
!             data = array.array(_array_fmts[self._sampwidth], data)
!             data.byteswap()
!             data.tofile(self._file)
!             self._datawritten = self._datawritten + len(data) * self._sampwidth
!         else:
!             self._file.write(data)
!             self._datawritten = self._datawritten + len(data)
!         self._nframeswritten = self._nframeswritten + nframes
! 
!     def writeframes(self, data):
!         self.writeframesraw(data)
!         if self._datalength != self._datawritten:
!             self._patchheader()
! 
!     def close(self):
!         self._ensure_header_written(0)
!         if self._datalength != self._datawritten:
!             self._patchheader()
!         self._file.flush()
!         self._file = None
! 
!     #
!     # Internal methods.
!     #
! 
!     def _ensure_header_written(self, datasize):
!         if not self._datawritten:
!             if not self._nchannels:
!                 raise Error, '# channels not specified'
!             if not self._sampwidth:
!                 raise Error, 'sample width not specified'
!             if not self._framerate:
!                 raise Error, 'sampling rate not specified'
!             self._write_header(datasize)
! 
!     def _write_header(self, initlength):
!         self._file.write('RIFF')
!         if not self._nframes:
!             self._nframes = initlength / (self._nchannels * self._sampwidth)
!         self._datalength = self._nframes * self._nchannels * self._sampwidth
!         self._form_length_pos = self._file.tell()
!         self._file.write(struct.pack('<lsslhhllhhs',
!             36 + self._datalength, 'WAVE', 'fmt ', 16,
!             WAVE_FORMAT_PCM, self._nchannels, self._framerate,
!             self._nchannels * self._framerate * self._sampwidth,
!             self._nchannels * self._sampwidth,
!             self._sampwidth * 8, 'data'))
!         self._data_length_pos = self._file.tell()
!         self._file.write(struct.pack('<l', self._datalength))
! 
!     def _patchheader(self):
!         if self._datawritten == self._datalength:
!             return
!         curpos = self._file.tell()
!         self._file.seek(self._form_length_pos, 0)
!         self._file.write(struct.pack('<l', 36 + self._datawritten))
!         self._file.seek(self._data_length_pos, 0)
!         self._file.write(struct.pack('<l', self._datawritten))
!         self._file.seek(curpos, 0)
!         self._datalength = self._datawritten
  
  def open(f, mode=None):
!     if mode is None:
!         if hasattr(f, 'mode'):
!             mode = f.mode
!         else:
!             mode = 'rb'
!     if mode in ('r', 'rb'):
!         return Wave_read(f)
!     elif mode in ('w', 'wb'):
!         return Wave_write(f)
!     else:
!         raise Error, "mode must be 'r', 'rb', 'w', or 'wb'"
  
  openfp = open # B/W compatibility

Index: whrandom.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/whrandom.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** whrandom.py	1998/08/10 20:07:53	1.14
--- whrandom.py	2000/02/04 15:28:42	1.15
***************
*** 1,53 ****
! #	WICHMANN-HILL RANDOM NUMBER GENERATOR
! #
! #	Wichmann, B. A. & Hill, I. D. (1982)
! #	Algorithm AS 183: 
! #	An efficient and portable pseudo-random number generator
! #	Applied Statistics 31 (1982) 188-190
! #
! #	see also: 
! #		Correction to Algorithm AS 183
! #		Applied Statistics 33 (1984) 123  
! #
! #		McLeod, A. I. (1985)
! #		A remark on Algorithm AS 183 
! #		Applied Statistics 34 (1985),198-200
! #
! #
! #	USE:
! #	whrandom.random()	yields double precision random numbers 
! #				uniformly distributed between 0 and 1.
! #
! #	whrandom.seed(x, y, z)	must be called before whrandom.random()
! #				to seed the generator
! #
! #	There is also an interface to create multiple independent
! #	random generators, and to choose from other ranges.
! 
! 
! #	Translated by Guido van Rossum from C source provided by
! #	Adrian Baddeley.
! 
! 
! # Multi-threading note: the random number generator used here is not
! # thread-safe; it is possible that nearly simultaneous calls in
! # different theads return the same random value.  To avoid this, you
! # have to use a lock around all calls.  (I didn't want to slow this
! # down in the serial case by using a lock here.)
  
  
  class whrandom:
- 	#
- 	# Initialize an instance.
- 	# Without arguments, initialize from current time.
- 	# With arguments (x, y, z), initialize from them.
- 	#
  	def __init__(self, x = 0, y = 0, z = 0):
  		self.seed(x, y, z)
! 	#
! 	# Set the seed from (x, y, z).
! 	# These must be integers in the range [0, 256).
! 	#
  	def seed(self, x = 0, y = 0, z = 0):
  		if not type(x) == type(y) == type(z) == type(0):
  			raise TypeError, 'seeds must be integers'
--- 1,51 ----
! """Wichman-Hill random number generator.
  
+ Wichmann, B. A. & Hill, I. D. (1982)
+ Algorithm AS 183: 
+ An efficient and portable pseudo-random number generator
+ Applied Statistics 31 (1982) 188-190
  
+ see also: 
+         Correction to Algorithm AS 183
+         Applied Statistics 33 (1984) 123  
+ 
+         McLeod, A. I. (1985)
+         A remark on Algorithm AS 183 
+         Applied Statistics 34 (1985),198-200
+ 
+ 
+ USE:
+ whrandom.random()       yields double precision random numbers 
+                         uniformly distributed between 0 and 1.
+ 
+ whrandom.seed(x, y, z)  must be called before whrandom.random()
+                         to seed the generator
+ 
+ There is also an interface to create multiple independent
+ random generators, and to choose from other ranges.
+ 
+ 
+ Translated by Guido van Rossum from C source provided by
+ Adrian Baddeley.
+ 
+ 
+ 
+ Multi-threading note: the random number generator used here is not
+ thread-safe; it is possible that nearly simultaneous calls in
+ different theads return the same random value.  To avoid this, you
+ have to use a lock around all calls.  (I didn't want to slow this
+ down in the serial case by using a lock here.)
+ """
+ 
  class whrandom:
  	def __init__(self, x = 0, y = 0, z = 0):
+ 		"""Initialize an instance.
+ 		Without arguments, initialize from current time.
+ 		With arguments (x, y, z), initialize from them."""
  		self.seed(x, y, z)
! 
  	def seed(self, x = 0, y = 0, z = 0):
+ 		"""Set the seed from (x, y, z).
+ 		These must be integers in the range [0, 256)."""
  		if not type(x) == type(y) == type(z) == type(0):
  			raise TypeError, 'seeds must be integers'
***************
*** 64,71 ****
  		# Zero is a poor seed, so substitute 1
  		self._seed = (x or 1, y or 1, z or 1)
! 	#
! 	# Get the next random number in the range [0.0, 1.0).
! 	#
  	def random(self):
  		# This part is thread-unsafe:
  		# BEGIN CRITICAL SECTION
--- 62,68 ----
  		# Zero is a poor seed, so substitute 1
  		self._seed = (x or 1, y or 1, z or 1)
! 
  	def random(self):
+ 		"""Get the next random number in the range [0.0, 1.0)."""
  		# This part is thread-unsafe:
  		# BEGIN CRITICAL SECTION
***************
*** 80,107 ****
  		#
  		return (x/30269.0 + y/30307.0 + z/30323.0) % 1.0
! 	#
! 	# Get a random number in the range [a, b).
! 	#
  	def uniform(self, a, b):
  		return a + (b-a) * self.random()
! 	#
! 	# Get a random integer in the range [a, b] including both end points.
! 	# (Deprecated; use randrange below.)
! 	#
  	def randint(self, a, b):
  		return self.randrange(a, b+1)
! 	#
! 	# Choose a random element from a non-empty sequence.
! 	#
  	def choice(self, seq):
  		return seq[int(self.random() * len(seq))]
! 	#
! 	# Choose a random item from range([start,] step[, stop]).
! 	# This fixes the problem with randint() which includes the
! 	# endpoint; in Python this is usually not what you want.
! 	#
! 	def randrange(self, start, stop=None, step=1,
! 		      # Do not supply the following arguments
! 		      int=int, default=None):
  		# This code is a bit messy to make it fast for the
  		# common case while still doing adequate error checking
--- 77,99 ----
  		#
  		return (x/30269.0 + y/30307.0 + z/30323.0) % 1.0
! 
  	def uniform(self, a, b):
+ 		"""Get a random number in the range [a, b)."""
  		return a + (b-a) * self.random()
! 
  	def randint(self, a, b):
+ 		"""Get a random integer in the range [a, b] including both end points.
+ 		(Deprecated; use randrange below.)"""
  		return self.randrange(a, b+1)
! 
  	def choice(self, seq):
+ 		"""Choose a random element from a non-empty sequence."""
  		return seq[int(self.random() * len(seq))]
! 
! 	def randrange(self, start, stop=None, step=1, int=int, default=None):
! 		"""Choose a random item from range([start,] step[, stop]).
! 		This fixes the problem with randint() which includes the
! 		endpoint; in Python this is usually not what you want.
! 	    Do not supply the 'int' and 'default' arguments."""
  		# This code is a bit messy to make it fast for the
  		# common case while still doing adequate error checking
***************
*** 137,141 ****
  
  # Initialize from the current time
- #
  _inst = whrandom()
  seed = _inst.seed
--- 129,132 ----



From guido@cnri.reston.va.us  Fri Feb  4 15:39:35 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 4 Feb 2000 10:39:35 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib asynchat.py,1.4,1.5 asyncore.py,1.3,1.4 binhex.py,1.11,1.12 copy.py,1.13,1.14 dircache.py,1.5,1.6 dospath.py,1.11,1.12 formatter.py,1.14,1.15 ftplib.py,1.39,1.40 getopt.py,1.8,1.9 gzip.py,1.16,1.17 locale.py,1.3,1.4 macurl2path.py,1.6,1.7 mimify.py,1.14,1.15 os.py,1.29,1.30 pdb.py,1.41,1.42 pyclbr.py,1.14,1.15 sched.py,1.10,1.11 smtplib.py,1.20,1.21 statcache.py,1.6,1.7 xmllib.py,1.16,1.17
Message-ID: <200002041539.KAA13722@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	asynchat.py asyncore.py binhex.py copy.py dircache.py 
	dospath.py formatter.py ftplib.py getopt.py gzip.py locale.py 
	macurl2path.py mimify.py os.py pdb.py pyclbr.py sched.py 
	smtplib.py statcache.py xmllib.py 
Log Message:
Actually, the previous batch's comment should have been different;
*this* set of patches is Ka-Ping's final sweep:

The attached patches update the standard library so that all modules
have docstrings beginning with one-line summaries.

A new docstring was added to formatter.  The docstring for os.py
was updated to mention nt, os2, ce in addition to posix, dos, mac.



Index: asynchat.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/asynchat.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** asynchat.py	1999/09/14 20:17:50	1.4
--- asynchat.py	2000/02/04 15:39:29	1.5
***************
*** 26,50 ****
  # ======================================================================
  
! import socket
! import asyncore
! import string
  
! # This class adds support for 'chat' style protocols - where one side
! # sends a 'command', and the other sends a response (examples would be
! # the common internet protocols - smtp, nntp, ftp, etc..).
  
! # The handle_read() method looks at the input stream for the current
! # 'terminator' (usually '\r\n' for single-line responses, '\r\n.\r\n'
! # for multi-line output), calling self.found_terminator() on its
! # receipt.
  
! # for example:
! # Say you build an async nntp client using this class.  At the start
! # of the connection, you'll have self.terminator set to '\r\n', in
! # order to process the single-line greeting.  Just before issuing a
! # 'LIST' command you'll set it to '\r\n.\r\n'.  The output of the LIST
! # command will be accumulated (using your own 'collect_incoming_data'
! # method) up to the terminator, and then control will be returned to
! # you - by calling your self.found_terminator() method
  
  class async_chat (asyncore.dispatcher):
--- 26,53 ----
  # ======================================================================
  
! """A class supporting chat-style (command/response) protocols.
! 
! This class adds support for 'chat' style protocols - where one side
! sends a 'command', and the other sends a response (examples would be
! the common internet protocols - smtp, nntp, ftp, etc..).
  
! The handle_read() method looks at the input stream for the current
! 'terminator' (usually '\r\n' for single-line responses, '\r\n.\r\n'
! for multi-line output), calling self.found_terminator() on its
! receipt.
  
! for example:
! Say you build an async nntp client using this class.  At the start
! of the connection, you'll have self.terminator set to '\r\n', in
! order to process the single-line greeting.  Just before issuing a
! 'LIST' command you'll set it to '\r\n.\r\n'.  The output of the LIST
! command will be accumulated (using your own 'collect_incoming_data'
! method) up to the terminator, and then control will be returned to
! you - by calling your self.found_terminator() method.
! """
  
! import socket
! import asyncore
! import string
  
  class async_chat (asyncore.dispatcher):

Index: asyncore.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/asyncore.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** asyncore.py	1999/09/14 20:15:19	1.3
--- asyncore.py	2000/02/04 15:39:29	1.4
***************
*** 26,29 ****
--- 26,50 ----
  # ======================================================================
  
+ """Basic infrastructure for asynchronous socket service clients and servers.
+ 
+ There are only two ways to have a program on a single processor do "more
+ than one thing at a time".  Multi-threaded programming is the simplest and 
+ most popular way to do it, but there is another very different technique,
+ that lets you have nearly all the advantages of multi-threading, without
+ actually using multiple threads. it's really only practical if your program
+ is largely I/O bound. If your program is CPU bound, then pre-emptive
+ scheduled threads are probably what you really need. Network servers are
+ rarely CPU-bound, however. 
+ 
+ If your operating system supports the select() system call in its I/O 
+ library (and nearly all do), then you can use it to juggle multiple
+ communication channels at once; doing other work while your I/O is taking
+ place in the "background."  Although this strategy can seem strange and
+ complex, especially at first, it is in many ways easier to understand and
+ control than multi-threaded programming. The module documented here solves
+ many of the difficult problems for you, making the task of building
+ sophisticated high-performance network servers and clients a snap. 
+ """
+ 
  import select
  import socket

Index: binhex.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/binhex.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** binhex.py	2000/02/02 15:10:14	1.11
--- binhex.py	2000/02/04 15:39:29	1.12
***************
*** 1,3 ****
! """binhex - Macintosh binhex compression/decompression
  
  easy interface:
--- 1,3 ----
! """Macintosh binhex compression/decompression.
  
  easy interface:

Index: copy.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/copy.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** copy.py	1999/01/25 21:37:02	1.13
--- copy.py	2000/02/04 15:39:29	1.14
***************
*** 1,5 ****
! """\
! Generic (shallow and deep) copying operations
! =============================================
  
  Interface summary:
--- 1,3 ----
! """Generic (shallow and deep) copying operations.
  
  Interface summary:

Index: dircache.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/dircache.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** dircache.py	2000/02/02 15:10:14	1.5
--- dircache.py	2000/02/04 15:39:29	1.6
***************
*** 1,5 ****
! """Return a sorted list of the files in a directory, using a cache
! to avoid reading the directory more often than necessary.
! Also contains a subroutine to append slashes to directories."""
  
  import os
--- 1,7 ----
! """Read and cache directory listings.
! 
! The listdir() routine returns a sorted list of the files in a directory,
! using a cache to avoid reading the directory more often than necessary.
! The annotate() routine appends slashes to directories."""
  
  import os

Index: dospath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/dospath.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** dospath.py	2000/02/04 15:10:32	1.11
--- dospath.py	2000/02/04 15:39:29	1.12
***************
*** 1,3 ****
! """Module 'dospath' -- common operations on DOS pathnames"""
  
  import os
--- 1,3 ----
! """Common operations on DOS pathnames."""
  
  import os

Index: formatter.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/formatter.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** formatter.py	1999/01/12 18:13:27	1.14
--- formatter.py	2000/02/04 15:39:29	1.15
***************
*** 1,2 ****
--- 1,22 ----
+ """Generic output formatting.
+ 
+ Formatter objects transform an abstract flow of formatting events into
+ specific output events on writer objects. Formatters manage several stack
+ structures to allow various properties of a writer object to be changed and
+ restored; writers need not be able to handle relative changes nor any sort
+ of ``change back'' operation. Specific writer properties which may be
+ controlled via formatter objects are horizontal alignment, font, and left
+ margin indentations. A mechanism is provided which supports providing
+ arbitrary, non-exclusive style settings to a writer as well. Additional
+ interfaces facilitate formatting events which are not reversible, such as
+ paragraph separation. 
+ 
+ Writer objects encapsulate device interfaces. Abstract devices, such as
+ file formats, are supported as well as physical devices. The provided
+ implementations all work with abstract devices. The interface makes
+ available mechanisms for setting the properties which formatter objects
+ manage and inserting data into the output. 
+ """
+ 
  import string
  import sys

Index: ftplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ftplib.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** ftplib.py	1999/08/18 21:51:10	1.39
--- ftplib.py	2000/02/04 15:39:29	1.40
***************
*** 1,3 ****
! '''An FTP client class, and some helper functions.
  Based on RFC 959: File Transfer Protocol
  (FTP), by J. Postel and J. Reynolds
--- 1,4 ----
! """An FTP client class and some helper functions.
! 
  Based on RFC 959: File Transfer Protocol
  (FTP), by J. Postel and J. Reynolds
***************
*** 32,36 ****
  A nice test that reveals some of the network dialogue would be:
  python ftplib.py -d localhost -l -p -l
! '''
  
  
--- 33,37 ----
  A nice test that reveals some of the network dialogue would be:
  python ftplib.py -d localhost -l -p -l
! """
  
  

Index: getopt.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/getopt.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** getopt.py	1999/12/21 22:38:40	1.8
--- getopt.py	2000/02/04 15:39:29	1.9
***************
*** 1,3 ****
! """Module getopt -- Parser for command line options.
  
  This module helps scripts to parse the command line arguments in
--- 1,3 ----
! """Parser for command line options.
  
  This module helps scripts to parse the command line arguments in

Index: gzip.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/gzip.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** gzip.py	2000/02/04 15:10:32	1.16
--- gzip.py	2000/02/04 15:39:29	1.17
***************
*** 1,3 ****
! """This module implements a function that reads and writes a gzipped file.
  The user of the file doesn't have to worry about the compression,
  but random access is not allowed."""
--- 1,4 ----
! """Functions that read and write gzipped files.
! 
  The user of the file doesn't have to worry about the compression,
  but random access is not allowed."""

Index: locale.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/locale.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** locale.py	1998/03/26 21:12:22	1.3
--- locale.py	2000/02/04 15:39:29	1.4
***************
*** 1,3 ****
! "Support for number formatting using the current locale settings"
  # Author: Martin von Loewis
  
--- 1,4 ----
! """Support for number formatting using the current locale settings."""
! 
  # Author: Martin von Loewis
  

Index: macurl2path.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/macurl2path.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** macurl2path.py	1999/06/01 14:36:56	1.6
--- macurl2path.py	2000/02/04 15:39:29	1.7
***************
*** 1,4 ****
! """Mac specific module for conversion between pathnames and URLs.
! Do not import directly, use urllib instead."""
  
  import string
--- 1,5 ----
! """Macintosh-specific module for conversion between pathnames and URLs.
! 
! Do not import directly; use urllib instead."""
  
  import string

Index: mimify.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mimify.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** mimify.py	2000/02/04 15:10:33	1.14
--- mimify.py	2000/02/04 15:39:29	1.15
***************
*** 1,5 ****
  #! /usr/bin/env python
  
! '''Mimification and unmimification of mail messages.
  
  Decode quoted-printable parts of a mail message or encode using
--- 1,5 ----
  #! /usr/bin/env python
  
! """Mimification and unmimification of mail messages.
  
  Decode quoted-printable parts of a mail message or encode using
***************
*** 20,24 ****
  to encode and decode respectively.  Infile defaults to standard
  input and outfile to standard output.
! '''
  
  # Configure
--- 20,24 ----
  to encode and decode respectively.  Infile defaults to standard
  input and outfile to standard output.
! """
  
  # Configure

Index: os.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/os.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** os.py	2000/02/04 15:10:33	1.29
--- os.py	2000/02/04 15:39:30	1.30
***************
*** 1,13 ****
! """os.py -- either mac, dos or posix depending on what system we're on.
  
  This exports:
!   - all functions from either posix or mac, e.g., os.unlink, os.stat, etc.
!   - os.path is either module posixpath or macpath
!   - os.name is either 'posix' or 'mac'
    - os.curdir is a string representing the current directory ('.' or ':')
    - os.pardir is a string representing the parent directory ('..' or '::')
    - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\')
!   - os.altsep is the alternatte pathname separator (None or '/')
    - os.pathsep is the component separator used in $PATH etc
    - os.defpath is the default search path for executables
  
--- 1,14 ----
! """OS routines for Mac, DOS, NT, or Posix depending on what system we're on.
  
  This exports:
!   - all functions from posix, nt, dos, os2, mac, or ce, e.g. unlink, stat, etc.
!   - os.path is one of the modules posixpath, ntpath, macpath, or dospath
!   - os.name is 'posix', 'nt', 'dos', 'os2', 'mac', or 'ce'
    - os.curdir is a string representing the current directory ('.' or ':')
    - os.pardir is a string representing the parent directory ('..' or '::')
    - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\')
!   - os.altsep is the alternate pathname separator (None or '/')
    - os.pathsep is the component separator used in $PATH etc
+   - os.linesep is the line separator in text files ('\r' or '\n' or '\r\n')
    - os.defpath is the default search path for executables
  

Index: pdb.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pdb.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** pdb.py	2000/02/04 15:10:33	1.41
--- pdb.py	2000/02/04 15:39:30	1.42
***************
*** 1,5 ****
  #! /usr/bin/env python
  
! """pdb.py -- finally, a Python debugger!"""
  
  # (See pdb.doc for documentation.)
--- 1,5 ----
  #! /usr/bin/env python
  
! """A Python debugger."""
  
  # (See pdb.doc for documentation.)

Index: pyclbr.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pyclbr.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** pyclbr.py	1999/06/16 12:28:12	1.14
--- pyclbr.py	2000/02/04 15:39:30	1.15
***************
*** 1,3 ****
! '''Parse a Python file and retrieve classes and methods.
  
  Parse enough of a Python file to recognize class and method
--- 1,3 ----
! """Parse a Python file and retrieve classes and methods.
  
  Parse enough of a Python file to recognize class and method
***************
*** 52,56 ****
    hairy logic that the import locator already does.  (This logic
    exists coded in Python in the freeze package.)
! ''' # ' <-- bow to font lock
  
  import os
--- 52,56 ----
    hairy logic that the import locator already does.  (This logic
    exists coded in Python in the freeze package.)
! """
  
  import os

Index: sched.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/sched.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** sched.py	1999/06/25 18:53:23	1.10
--- sched.py	2000/02/04 15:39:30	1.11
***************
*** 1,3 ****
! """Module sched -- a generally useful event scheduler class
  
  Each instance of this class manages its own queue.
--- 1,3 ----
! """A generally useful event scheduler class.
  
  Each instance of this class manages its own queue.

Index: smtplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/smtplib.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** smtplib.py	1999/11/28 17:11:06	1.20
--- smtplib.py	2000/02/04 15:39:30	1.21
***************
*** 1,5 ****
  #! /usr/bin/env python
  
! '''SMTP/ESMTP client class.
  
  Author: The Dragon De Monsyne <dragondm@integral.org>
--- 1,5 ----
  #! /usr/bin/env python
  
! """SMTP/ESMTP client class.
  
  Author: The Dragon De Monsyne <dragondm@integral.org>
***************
*** 38,42 ****
    (250, "Somebody OverHere <somebody@here.my.org>")
    >>> s.quit()
! '''
  
  import socket
--- 38,42 ----
    (250, "Somebody OverHere <somebody@here.my.org>")
    >>> s.quit()
! """
  
  import socket

Index: statcache.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/statcache.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** statcache.py	2000/02/04 15:28:41	1.6
--- statcache.py	2000/02/04 15:39:30	1.7
***************
*** 1,3 ****
! """Maintain a cache of file stats.
  There are functions to reset the cache or to selectively remove items.
  """
--- 1,4 ----
! """Maintain a cache of stat() information on files.
! 
  There are functions to reset the cache or to selectively remove items.
  """

Index: xmllib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/xmllib.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** xmllib.py	1999/08/26 15:52:33	1.16
--- xmllib.py	2000/02/04 15:39:30	1.17
***************
*** 1,3 ****
! # A parser for XML, using the derived class as static DTD.
  # Author: Sjoerd Mullender.
  
--- 1,4 ----
! """A parser for XML, using the derived class as static DTD."""
! 
  # Author: Sjoerd Mullender.
  



From fdrake@weyr.cnri.reston.va.us  Fri Feb  4 17:40:05 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 4 Feb 2000 12:40:05 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/html index.html.in,1.4,1.4.4.1
Message-ID: <200002041740.MAA09963@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/html
In directory weyr:/home/fdrake/projects/python/Doc-152p1/html

Modified Files:
      Tag: release152p1-patches
	index.html.in 
Log Message:

Make sure the version number in the <title> is updated; problem
reported by Peter Funk <pf@artcom-gmbh.de>.


Index: index.html.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/html/index.html.in,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** index.html.in	1999/05/27 21:56:11	1.4
--- index.html.in	2000/02/04 17:40:02	1.4.4.1
***************
*** 1,5 ****
  <html>
    <head>
!     <title>Python 1.5.2 Documentation</title>
      <link rel=STYLESHEET href="lib/lib.css" type="text/css">
      <style type="text/css">
--- 1,5 ----
  <html>
    <head>
!     <title>Python @VERSION@ Documentation</title>
      <link rel=STYLESHEET href="lib/lib.css" type="text/css">
      <style type="text/css">



From just@letterror.com  Fri Feb  4 17:44:14 2000
From: just@letterror.com (Just van Rossum)
Date: Fri, 4 Feb 2000 18:44:14 +0100
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
In-Reply-To: <20000204170033.146251CE24@dinsdale.python.org>
Message-ID: <l0310280bb4c0bf8409c7@[193.78.237.128]>

Guys,

They idea of sending diffs along is pretty cool (although I don't care for
it much), today's set was insanely large: more than 300K. This sucks.
Please, either don't send diffs altogether (my preference, this *is* about
CVS access after all!) or at least filter them so only small ones get
through.

Thanks,

Just




From guido@cnri.reston.va.us  Fri Feb  4 17:47:58 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 4 Feb 2000 12:47:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib dis.py,1.18,1.19
Message-ID: <200002041747.MAA14496@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	dis.py 
Log Message:
Added a simple test program to disassemble a file, invoked as __main__.


Index: dis.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/dis.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** dis.py	1999/05/03 18:09:53	1.18
--- dis.py	2000/02/04 17:47:55	1.19
***************
*** 252,253 ****
--- 252,280 ----
  def_op('MAKE_FUNCTION', 132)
  def_op('BUILD_SLICE', 133)
+ 
+ 
+ def _test():
+ 	"""Simple test program to disassemble a file."""
+ 	if sys.argv[1:]:
+ 		if sys.argv[2:]:
+ 			sys.stderr.write("usage: python dis.py [-|file]\n")
+ 			sys.exit(2)
+ 		fn = sys.argv[1]
+ 		if not fn or fn == "-":
+ 			fn = None
+ 	else:
+ 		fn = None
+ 	if not fn:
+ 		f = sys.stdin
+ 	else:
+ 		f = open(fn)
+ 	source = f.read()
+ 	if fn:
+ 		f.close()
+ 	else:
+ 		fn = "<stdin>"
+ 	code = compile(source, fn, "exec")
+ 	dis(code)
+ 
+ if __name__ == "__main__":
+ 	_test()



From pf@artcom-gmbh.de  Fri Feb  4 18:53:00 2000
From: pf@artcom-gmbh.de (Peter Funk)
Date: Fri, 4 Feb 2000 19:53:00 +0100 (MET)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
In-Reply-To: <l0310280bb4c0bf8409c7@[193.78.237.128]> from Just van Rossum at "Feb 4, 2000  6:44:14 pm"
Message-ID: <m12Gnqm-000CywC@artcom0.artcom-gmbh.de>

Just van Rossum:
> They idea of sending diffs along is pretty cool (although I don't care for
> it much), today's set was insanely large: more than 300K. This sucks.
> Please, either don't send diffs altogether (my preference, this *is* about
> CVS access after all!) or at least filter them so only small ones get
> through.

Well, I like browsing through the diffs (its fun to see, how it grows)
and I don't care much about this bandwith issue as long as they are
kept below 5 MB or so.  However I would prefer unified context diffs
(created by diff -u).  They would take up only half the space and are
(which is more important) much much easier to read.

I'm not very familar with CVS, so I would like to know which
tool/script produces these mails?  I've asked one of my employees,
who is more familar with CVS, but he also didn't know.

Regards, Peter
-- 
Peter Funk, Oldenburger Str.86, 27777 Ganderkesee, Tel: 04222 9502 70, Fax: -60


From bwarsaw@cnri.reston.va.us (Barry A. Warsaw)  Fri Feb  4 19:21:13 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw) (Barry A. Warsaw)
Date: Fri, 4 Feb 2000 14:21:13 -0500 (EST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
References: <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <m12Gnqm-000CywC@artcom0.artcom-gmbh.de>
Message-ID: <14491.9897.241252.677374@anthem.cnri.reston.va.us>

>>>>> "PF" == Peter Funk <pf@artcom-gmbh.de> writes:

    PF> Well, I like browsing through the diffs (its fun to see, how
    PF> it grows) and I don't care much about this bandwith issue as
    PF> long as they are kept below 5 MB or so.  However I would
    PF> prefer unified context diffs (created by diff -u).  They would
    PF> take up only half the space and are (which is more important)
    PF> much much easier to read.

The concensus when we voted last time was for context 2 diffs.
Personally, I find unifieds harder to read (and I think Guido
agreed).

    PF> I'm not very familar with CVS, so I would like to know which
    PF> tool/script produces these mails?  I've asked one of my
    PF> employees, who is more familar with CVS, but he also didn't
    PF> know.

It's a loginfo script that I've hacked together over the years.  It's
not pretty because it deals with lots of CVS, ssh, rsync, and sendmail
peculiarities.  I include it below for your enjoyment.  It would be
trivial to change to unifieds.

Invoked by a CVSROOT/loginfo entry like so:

python/dist	/projects/cvsroot/CVSROOT/syncmail --norecurse %{sVv} python-checkins@python.org

Enjoy,
-Barry

-------------------- snip snip --------------------
#! /depot/sundry/plat/bin/python

# To do:
#  -- why does this seem to take so long for some people?

"""Complicated syncing and notification for CVS checkins.

This script is intended to be run from the CVS loginfo file.  It handles
optional email notifications, fake reply addressing, and remote syncing via
rsync/ssh.  All these things are useful when you an Open Source software
development process.

Usage:

syncmail [--exclude=EX ...] [--norecurse] [--fg] [--nosync] [--munge] [-h]
         [--cvsroot=<path>] <%%S> [email-addrs ...]

Where:
    --exclude=EX
        any number of rsync --exclude= options.  These are passed directly to
        the rsync process

    --norecurse
        Do not do a recursive sync.  Sync only in the specified directory.

    --fg
        Run the rsync command in the foreground

    --nosync
        Do not run rsync at all

    --munge
        Munge return addresses.  Ordinarily, email is send with the
        /usr/ucb/Mail command and the return address is provided by the
        system.  However, when remote maintainers check in changes, their
        addresses will incorrectly seem like they come from the machine or
        domain running the CVS repository.  When this option is given, the
        user making the check in is looked up in the /etc/mail/aliases file.
        If a match is found, their alias expansion is forced as the return
        address and /bin/mailx is used as the MUA.

    --cvsroot=<path>
    	Use <path> as the environment variable CVSROOT.  Otherwise this
    	variable must exist in the environment.

    --help
    -h
        Print this text.

    <%%S>
        CVS %%s loginfo expansion.  This will be a single string containing
        the directory the checkin is being made in, relative to $CVSROOT,
        followed by the list of files that are changing

    email-addrs
        any number of email addrs if mail is to be sent.  if omitted, no mail
        is sent.
""" #'

# The shell transport used to run rsync over
SSH_CMD = '/depot/sundry/plat/bin/ssh -i <path-to-key> -l rsync'

# Exclude CVS lock files.  This is required because when the loginfo command
# is executed, CVS is still retaining locks on directories.  If the locks are
# rsync'd over, then the remote repository mirror will be hosed.
EXCLUDES = ['--exclude "#cvs.*"']
NORECURSE_EXCLUDE = '--exclude "/*/*"'

# The location of $CVSROOT on the remote machine
REM_CVSROOT = 'sweetpea:/projects/cvsroot'

# Template for the rsync command
RSYNC_OPTS = '-av --delete'
RSYNC_CMD = '/depot/sundry/plat/bin/rsync %(RSYNC_OPTS)s %(LOC_SYNCDIR)s %(REM_SYNCDIR)s %(XCLUDES)s'

# Notification command
MAIL_CMD = '%(mailcmd)s -s "CVS: %(SUBJECT)s" %(PEOPLE)s'
MAILPROG = '/usr/ucb/Mail'
MUNGE_MAILPROG = '/bin/mailx'
MUNGE_IGNORE = ['bwarsaw']
MUNGE_ALIASFILES = ['/etc/mail/aliases']

DIFF_HEAD_LINES = 20
DIFF_TAIL_LINES = 20
DIFF_TRUNCATE_IF_LARGER = 1000

import os
import sys
import string
import time



def find_aliases(files):
    aliases = {}
    for file in files:
	try:
	    fp = open(file)
	    lines = fp.readlines()
	    fp.close()
	except IOError:
	    continue
        # read the file
	for line in lines:
	    line = string.strip(string.lower(line))
	    # skip blank lines and comments
	    if line == '' or line[0] == '#':
		continue
	    # TBD: doesn't handle split lines
	    i = string.find(line, ":")
	    if i < 0:
		# skip this line
		continue
	    alias = line[:i]
	    expansion = string.strip(line[i+1:])
	    # some expansions are worthless.  drop everything that is a
	    # program, file, or distribution list
	    if string.count(expansion, "/") or \
	       string.count(expansion, "|") or \
	       string.count(expansion, ","):
		continue
	    # overwrites any previous entry
	    aliases[alias] = expansion
    return aliases



def calculate_diff(filespec):
    try:
        file, oldrev, newrev = string.split(filespec, ',')
    except ValueError:
        # No diff to report
        return ''
    # This /has/ to happen in the background, otherwise we'll run into CVS
    # lock contention.  What a crock.
    diffcmd = 'cvs -f diff -C 2 -r %s -r %s %s' % (oldrev, newrev, file)
    fp = os.popen(diffcmd)
    lines = fp.readlines()
    sts = fp.close()
    # ignore the error code, it always seems to be 1 :(
##    if sts:
##        return 'Error code %d occurred during diff\n' % (sts >> 8)
    if len(lines) > DIFF_TRUNCATE_IF_LARGER:
        removedlines = len(lines) - DIFF_HEAD_LINES - DIFF_TAIL_LINES
        del lines[DIFF_HEAD_LINES:-DIFF_TAIL_LINES]
        lines.insert(DIFF_HEAD_LINES,
                     '[...%d lines suppressed...]\n' % removedlines)
    return string.join(lines, '')



def blast_mail(mailcmd, filestodiff):
    # cannot wait for child process or that will cause parent to retain cvs
    # lock for too long.  Urg!
    if not os.fork():
        # in the child
        # give up the lock you cvs thang!
        time.sleep(2)
##        fp = open('/tmp/debug', 'a')
        fp = os.popen(cmd, 'w')
        fp.write(sys.stdin.read())
        fp.write('\n')
        # append the diffs if available
        for file in specs[1:]:
            fp.write(calculate_diff(file))
            fp.write('\n')
        fp.close()
        # doesn't matter what code we return, it isn't waited on
        os._exit(0)



os.environ['RSYNC_RSH'] = SSH_CMD

# scan args for options
recurse = 1
fg = 0
munge = 0
sync = 1
args = sys.argv[1:]
while args:
    arg = args[0]
    if arg[:len('--exclude=')] == '--exclude=':
        i = string.find(arg, '=')
        EXCLUDES = EXCLUDES + ['--exclude', '"%s"' % arg[i+1:]]
        del args[0]
    elif arg == '--norecurse':
        recurse = 0
        del args[0]
    elif arg == '--fg':
        fg = 1
        del args[0]
    elif arg == '--munge':
        munge = 1
        del args[0]
    elif arg == '--nosync':
        sync = 0
        del args[0]
    elif arg[:10] == '--cvsroot=':
        os.environ['CVSROOT'] = arg[10:]
        del args[0]
    elif arg in ('-h', '--help'):
        print __doc__
        sys.exit(0)
    else:
        break

# What follows is the specification containing the files that were modified.
# The argument actually must be split, with the first component containing the 
# directory the checkin is being made in, relative to $CVSROOT, followed by
# the list of files that are changing.
SUBJECT = args[0]
specs = string.split(args[0])
del args[0]

# Docs for CVS state that $CVSROOT will be the root in use
if not recurse:
    # The only way to really do non-recursion correctly, in the face of
    # possible deletions, is to specify the source directory completely
    # including the final slash, specify the target directory completely
    # including the final slash, and explicitly exclude /*/* which tells rsync 
    # to exclude the contents of all subdirectories.  The actual
    # subdirectories themselves will be included though (but that shouldn't be 
    # a problem).  This is necessary because if the source isn't a directory,
    # --delete will no-op.  This is highly oblique; thanks to KLM for the
    # solution!
    EXCLUDES.append(NORECURSE_EXCLUDE)

REPO_DIR = specs[0]
LOC_SYNCDIR = os.path.join(os.environ['CVSROOT'], REPO_DIR)
# make sure there's a trailing slash!!!
if LOC_SYNCDIR[-1] <> '/':
    LOC_SYNCDIR = LOC_SYNCDIR + '/'
REM_SYNCDIR = os.path.join(REM_CVSROOT, REPO_DIR)
# same
if REM_SYNCDIR[-1] <> '/':
    REM_SYNCDIR = REM_SYNCDIR + '/'

XCLUDES = string.join(EXCLUDES)

if sync:
    cmd = RSYNC_CMD % vars()
    if not fg:
        cmd = cmd + ' 2>&1 > /dev/null &'
    print '*****************************************\n', cmd, \
          '\n*****************************************'
    sts = os.system(cmd)

# if no email addresses, do not send mail
if args:
    # possibly munge the addresses
    PEOPLE = string.join(args)
    if munge:
        user = os.environ['USER'] or os.environ['LOGNAME']
        # this is necessary because some addresses just don't work with mailx
        # -r. e.g. -r bwarsaw@cnri.reston.va.us just causes mailx to send the
        # mail to the bit bucket.  I have no idea why.
        retaddr = None
	if user not in MUNGE_IGNORE:
	    aliases = find_aliases(MUNGE_ALIASFILES)
	    retaddr = aliases.get(user)
        # protect subject from /bin/sh
        mailcmd = MUNGE_MAILPROG
        if retaddr:
            mailcmd = mailcmd + ' -r ' + retaddr
    else:
        mailcmd = MAILPROG
    cmd = MAIL_CMD % vars()
    if not fg:
        cmd = cmd + ' 2>&1 > /dev/null'
    # Now do the mail command
    print 'Mailed', PEOPLE
    blast_mail(mailcmd, specs[1:])
    sts = 0

sys.exit(sts)



From fdrake@weyr.cnri.reston.va.us  Fri Feb  4 20:32:37 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 4 Feb 2000 15:32:37 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules md5module.c,2.12,2.13
Message-ID: <200002042032.PAA12317@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory weyr:/home/fdrake/projects/python/Modules

Modified Files:
	md5module.c 
Log Message:

Patch from Paul Sokolovsky <Paul.Sokolovsky@technologist.com>:

      Attached is patch (against 1.5.2 release) to allow some modules
to be buildable as pyd's (usual &PyType_Type stuff).


Index: md5module.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/md5module.c,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** md5module.c	1998/12/04 18:49:53	2.12
--- md5module.c	2000/02/04 20:32:35	2.13
***************
*** 201,205 ****
  
  statichere PyTypeObject MD5type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0,			  /*ob_size*/
  	"md5",			  /*tp_name*/
--- 201,205 ----
  
  statichere PyTypeObject MD5type = {
! 	PyObject_HEAD_INIT(NULL)
  	0,			  /*ob_size*/
  	"md5",			  /*tp_name*/
***************
*** 272,275 ****
--- 272,277 ----
  {
  	PyObject *m, *d;
+ 
+         MD5type.ob_type = &PyType_Type;
  	m = Py_InitModule3("md5", md5_functions, module_doc);
  	d = PyModule_GetDict(m);



From fdrake@weyr.cnri.reston.va.us  Fri Feb  4 20:33:30 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 4 Feb 2000 15:33:30 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules pcremodule.c,2.14,2.15
Message-ID: <200002042033.PAA12344@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory weyr:/home/fdrake/projects/python/Modules

Modified Files:
	pcremodule.c 
Log Message:

Patch from Paul Sokolovsky <Paul.Sokolovsky@technologist.com>:

      Attached is patch (against 1.5.2 release) to allow some modules
to be buildable as pyd's (usual &PyType_Type stuff).


Index: pcremodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/pcremodule.c,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** pcremodule.c	1999/02/01 17:09:00	2.14
--- pcremodule.c	2000/02/04 20:33:27	2.15
***************
*** 166,170 ****
  
  staticforward PyTypeObject Pcre_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0,			/*ob_size*/
  	"Pcre",			/*tp_name*/
--- 166,170 ----
  
  staticforward PyTypeObject Pcre_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0,			/*ob_size*/
  	"Pcre",			/*tp_name*/
***************
*** 664,667 ****
--- 664,669 ----
  {
  	PyObject *m, *d;
+ 
+         Pcre_Type.ob_type = &PyType_Type;
  
  	/* Create the module and add the functions */



From fdrake@weyr.cnri.reston.va.us  Fri Feb  4 20:33:52 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 4 Feb 2000 15:33:52 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules arraymodule.c,2.37,2.38
Message-ID: <200002042033.PAA12369@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory weyr:/home/fdrake/projects/python/Modules

Modified Files:
	arraymodule.c 
Log Message:

Patch from Paul Sokolovsky <Paul.Sokolovsky@technologist.com>:

      Attached is patch (against 1.5.2 release) to allow some modules
to be buildable as pyd's (usual &PyType_Type stuff).


Index: arraymodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/arraymodule.c,v
retrieving revision 2.37
retrieving revision 2.38
diff -C2 -r2.37 -r2.38
*** arraymodule.c	2000/01/20 22:32:53	2.37
--- arraymodule.c	2000/02/04 20:33:49	2.38
***************
*** 1449,1453 ****
  
  statichere PyTypeObject Arraytype = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0,
  	"array",
--- 1449,1453 ----
  
  statichere PyTypeObject Arraytype = {
! 	PyObject_HEAD_INIT(NULL)
  	0,
  	"array",
***************
*** 1477,1480 ****
--- 1477,1482 ----
  {
  	PyObject *m, *d;
+ 
+         Arraytype.ob_type = &PyType_Type;
  	m = Py_InitModule3("array", a_methods, module_doc);
  	d = PyModule_GetDict(m);



From skip@mojam.com (Skip Montanaro)  Fri Feb  4 21:32:31 2000
From: skip@mojam.com (Skip Montanaro) (Skip Montanaro)
Date: Fri, 4 Feb 2000 15:32:31 -0600 (CST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
In-Reply-To: <l0310280bb4c0bf8409c7@[193.78.237.128]>
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
Message-ID: <14491.17775.445979.618818@beluga.mojam.com>

    Just> They idea of sending diffs along is pretty cool (although I don't
    Just> care for it much), today's set was insanely large: more than
    Just> 300K. This sucks.

Amen to that...

I remember that Greg Stein did something to elide long context diffs (maybe
just trim them to 40kbytes or so?) in his checkin stuff.  Barry, I thought
you were about to adopt that convention as well.  Perhaps now would be the
time? 

Skip Montanaro | http://www.mojam.com/
skip@mojam.com | http://www.musi-cal.com/
847-971-7098
"Languages that change by catering to the tastes of non-users tend
not to do so well." - Doug Landauer


From bwarsaw@cnri.reston.va.us (Barry A. Warsaw)  Fri Feb  4 21:27:51 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw) (Barry A. Warsaw)
Date: Fri, 4 Feb 2000 16:27:51 -0500 (EST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
Message-ID: <14491.17495.983347.695677@anthem.cnri.reston.va.us>

>>>>> "SM" == Skip Montanaro <skip@mojam.com> writes:

    SM> I remember that Greg Stein did something to elide long context
    SM> diffs (maybe just trim them to 40kbytes or so?) in his checkin
    SM> stuff.  Barry, I thought you were about to adopt that
    SM> convention as well.  Perhaps now would be the time?

What Greg wanted, and what I implemented, was trimming the diffs if
they were larger than x lines, where x currently == 1000.  In that
case, we trim the diffs to 40 lines.  This doesn't help you if there
are tons of smaller diffs in a digest.  I'm happy to tweak the numbers
if people want, but I'm not going to do any significant work on the
script (no time).

-Barry


From just@letterror.com  Fri Feb  4 21:45:01 2000
From: just@letterror.com (Just van Rossum)
Date: Fri, 4 Feb 2000 22:45:01 +0100
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol
 1 #346 - 1 msg)
In-Reply-To: <14491.17495.983347.695677@anthem.cnri.reston.va.us>
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
Message-ID: <l03102812b4c0f7fd57a4@[193.78.237.128]>

At 4:27 PM -0500 04-02-2000, Barry A. Warsaw wrote:
>What Greg wanted, and what I implemented, was trimming the diffs if
>they were larger than x lines, where x currently == 1000.  In that
>case, we trim the diffs to 40 lines.  This doesn't help you if there
>are tons of smaller diffs in a digest.  I'm happy to tweak the numbers
>if people want, but I'm not going to do any significant work on the
>script (no time).

It seems today's situation proved that this is not the right approach...

Wouldn't it make much more sense to not send *any* diffs, but install
view-cvs.py or whatever it's called on *.python.org?

Or otherwise: remove the feature, and reinstate it when someone has gotten
'round to implement a sane version.

Just




From skip@mojam.com (Skip Montanaro)  Fri Feb  4 22:02:13 2000
From: skip@mojam.com (Skip Montanaro) (Skip Montanaro)
Date: Fri, 4 Feb 2000 16:02:13 -0600 (CST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
In-Reply-To: <14491.17495.983347.695677@anthem.cnri.reston.va.us>
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <14491.17495.983347.695677@anthem.cnri.reston.va.us>
Message-ID: <14491.19557.75652.954477@beluga.mojam.com>

    BAW> What Greg wanted, and what I implemented, was trimming the diffs if
    BAW> they were larger than x lines, where x currently == 1000.  In that
    BAW> case, we trim the diffs to 40 lines.  This doesn't help you if
    BAW> there are tons of smaller diffs in a digest.

This would suggest that Ping's recent documentation submission was an
"exceptional" event that would normally not be seen and can be ignored.
(How often do the CNRI folks commit one change to such a large number of
individual files?)

Skip


From bwarsaw@cnri.reston.va.us  Fri Feb  4 21:55:00 2000
From: bwarsaw@cnri.reston.va.us (bwarsaw@cnri.reston.va.us)
Date: Fri, 4 Feb 2000 16:55:00 -0500 (EST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol
 1 #346 - 1 msg)
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <l03102812b4c0f7fd57a4@[193.78.237.128]>
Message-ID: <14491.19124.921076.656526@anthem.cnri.reston.va.us>

>>>>> "JvR" == Just van Rossum <just@letterror.com> writes:

    JvR> It seems today's situation proved that this is not the right
    JvR> approach...

    JvR> Wouldn't it make much more sense to not send *any* diffs, but
    JvR> install view-cvs.py or whatever it's called on *.python.org?

http://cvs.python.org/

    JvR> Or otherwise: remove the feature, and reinstate it when
    JvR> someone has gotten 'round to implement a sane version.

Or chop the truncation limit down from 1000 lines.  Would 100 make
more sense?

-Barry


From fdrake@acm.org  Fri Feb  4 21:57:58 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Fri, 4 Feb 2000 16:57:58 -0500 (EST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
In-Reply-To: <14491.19557.75652.954477@beluga.mojam.com>
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <14491.17495.983347.695677@anthem.cnri.reston.va.us>
 <14491.19557.75652.954477@beluga.mojam.com>
Message-ID: <14491.19302.388993.659891@weyr.cnri.reston.va.us>

Skip Montanaro writes:
 > This would suggest that Ping's recent documentation submission was an
 > "exceptional" event that would normally not be seen and can be ignored.
 > (How often do the CNRI folks commit one change to such a large number of
 > individual files?)

  I've been known to do such things at times, but it is fairly
unusual.  (It's usually not on the Python tree as well, so it's not a
problem for people not on that project.)
  Of course, everyone knows how cruel I can be.  ;-)
  Anyway, for those not on the patches list yet, let it be known that
the first patch submitted through that list was not handled by The
Guido!


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From Fredrik Lundh" <effbot@telia.com  Fri Feb  4 22:08:14 2000
From: Fredrik Lundh" <effbot@telia.com (Fredrik Lundh)
Date: Fri, 4 Feb 2000 23:08:14 +0100
Subject: [Python-checkins] Insanity!
References: <20000204170033.146251CE24@dinsdale.python.org><l0310280bb4c0bf8409c7@[193.78.237.128]><14491.17775.445979.618818@beluga.mojam.com> <l03102812b4c0f7fd57a4@[193.78.237.128]>
Message-ID: <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>

> It seems today's situation proved that this is not the right =
approach...

on the other hand, how common are todays situation?
the recent crop of changes affected the whole standard
library.  I doubt there will=20

> Wouldn't it make much more sense to not send *any* diffs, but install
> view-cvs.py or whatever it's called on *.python.org?

it's already there: http://cvs.python.org/cgi-bin/viewcvs.cgi/

but clicking around in there takes ages.  maybe the script
could be tweaked to include complete URL's instead of diffs,
if the diff is larger than, say, 50 lines.  e.g:

http://cvs.python.org/cgi-bin/viewcvs.cgi/python/dist/src/Lib/bisect.py?r=
ev=3D1.4&content-type=3Dtext/vnd.viewcvs-markup

> Or otherwise: remove the feature, and reinstate it when someone has =
gotten
> 'round to implement a sane version.

or force everyone to get a cable modem ;-)

(maybe we could trick Barry into adding some kind of "optional
filter" mechanism to mailman, so people can pick their favourite
format?)

</F>



From Fredrik Lundh" <effbot@telia.com  Fri Feb  4 22:11:09 2000
From: Fredrik Lundh" <effbot@telia.com (Fredrik Lundh)
Date: Fri, 4 Feb 2000 23:11:09 +0100
Subject: [Python-checkins] Insanity!
References: <20000204170033.146251CE24@dinsdale.python.org><l0310280bb4c0bf8409c7@[193.78.237.128]><14491.17775.445979.618818@beluga.mojam.com> <l03102812b4c0f7fd57a4@[193.78.237.128]> <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
Message-ID: <008a01bf6f5c$be05f8c0$f4a7b5d4@hagrid>

I wrote:=20
> on the other hand, how common are todays situation?
> the recent crop of changes affected the whole standard
> library.  I doubt there will=20

and then accidentally pressed "send" before finishing
(and fixing) that paragraph...

(I'm sure you can all figure out what I was trying to say ;-)

</F>



From just@letterror.com  Fri Feb  4 22:17:52 2000
From: just@letterror.com (Just van Rossum)
Date: Fri, 4 Feb 2000 23:17:52 +0100
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol
 1 #346 - 1 msg)
In-Reply-To: <14491.19124.921076.656526@anthem.cnri.reston.va.us>
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <l03102812b4c0f7fd57a4@[193.78.237.128]>
Message-ID: <l03102813b4c0fc5d5f99@[193.78.237.128]>

At 4:55 PM -0500 04-02-2000, bwarsaw@cnri.reston.va.us wrote:
>http://cvs.python.org/

Oops. Cool! Never saw that on comp.lang.python.announce ;-)

>Or chop the truncation limit down from 1000 lines.  Would 100 make
>more sense?

I guess its too late for that now(*), but I'd like to make another argument
for *no* diffs in the checking messages:

For me, the log messages are much more important than the diffs. I want to
read what file has changed, and why it has changed. In most cases I don't
care about the details, and if I do, it's easy enough to go through cvs.
Now, because I'm just keeping a loose eye on what's going on, I subscribe
as digest. That's wonderful: every day I get one email with a list of
changes with their comments. However, with the diff stuff in place, I have
to wade through screenfuls of diffs that I don't care about to get to the
log messages that I *do* care about. They almost disappear in the mud.

Overall, the current situation is very much sub-optimal for me, and I even
consider unsubscribing. Note that this isn't so much an issue of
band-width, but of getting the information that I care about in a
convenient way.

*) I've never seen the "voting" you alluded to earlier, probably because
that took place on a list that I'm not on. I find that slightly odd...


Just




From bwarsaw@cnri.reston.va.us (Barry A. Warsaw)  Fri Feb  4 23:04:16 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw) (Barry A. Warsaw)
Date: Fri, 4 Feb 2000 18:04:16 -0500 (EST)
Subject: [Python-checkins] Insanity!
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <l03102812b4c0f7fd57a4@[193.78.237.128]>
 <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
Message-ID: <14491.23280.860145.794112@anthem.cnri.reston.va.us>

>>>>> "FL" == Fredrik Lundh <effbot@telia.com> writes:

    FL> (maybe we could trick Barry into adding some kind of "optional
    FL> filter" mechanism to mailman, so people can pick their
    FL> favourite format?)

That's actually not feasible because you'd crush the server if it had
to hand craft a message for each individual recipient.  The best you
can do is create two lists, one that includes the patches and another
that doesn't, but I'd like to avoid that.

-Barry


From bwarsaw@cnri.reston.va.us  Fri Feb  4 23:11:11 2000
From: bwarsaw@cnri.reston.va.us (bwarsaw@cnri.reston.va.us)
Date: Fri, 4 Feb 2000 18:11:11 -0500 (EST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol
 1 #346 - 1 msg)
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <l03102812b4c0f7fd57a4@[193.78.237.128]>
 <l03102813b4c0fc5d5f99@[193.78.237.128]>
Message-ID: <14491.23695.786473.452572@anthem.cnri.reston.va.us>

>>>>> "JvR" == Just van Rossum <just@letterror.com> writes:

    JvR> Oops. Cool! Never saw that on comp.lang.python.announce ;-)

I've just corrected that!  Thanks.

I'll let Greg answer the rest, if he wants.

-Barry


From Fredrik Lundh" <effbot@telia.com  Fri Feb  4 23:18:56 2000
From: Fredrik Lundh" <effbot@telia.com (Fredrik Lundh)
Date: Sat, 5 Feb 2000 00:18:56 +0100
Subject: [Python-checkins] Insanity!
References: <20000204170033.146251CE24@dinsdale.python.org><l0310280bb4c0bf8409c7@[193.78.237.128]><14491.17775.445979.618818@beluga.mojam.com><l03102812b4c0f7fd57a4@[193.78.237.128]><008401bf6f5c$56574ee0$f4a7b5d4@hagrid> <14491.23280.860145.794112@anthem.cnri.reston.va.us>
Message-ID: <010501bf6f66$372b5fc0$f4a7b5d4@hagrid>

Barry A. Warsaw wrote:
>     FL> (maybe we could trick Barry into adding some kind of "optional
>     FL> filter" mechanism to mailman, so people can pick their
>     FL> favourite format?)
>=20
> That's actually not feasible because you'd crush the server if it had
> to hand craft a message for each individual recipient.  The best you
> can do is create two lists, one that includes the patches and another
> that doesn't, but I'd like to avoid that.

what I had in mind was to let mailman provide a "unified
interface" to two or more different mail sources...

(e.g. people sign up to python-checkins, and gets
messages from either python-checkins-standard or
python-checkins-slow_modem, depending on a user-
dependent setting...)

but no, you don't have to implement that now ;-)

</F>



From bwarsaw@cnri.reston.va.us  Fri Feb  4 23:23:16 2000
From: bwarsaw@cnri.reston.va.us (bwarsaw@cnri.reston.va.us)
Date: Fri, 4 Feb 2000 18:23:16 -0500 (EST)
Subject: [Python-checkins] Insanity!
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <l03102812b4c0f7fd57a4@[193.78.237.128]>
 <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
 <14491.23280.860145.794112@anthem.cnri.reston.va.us>
 <010501bf6f66$372b5fc0$f4a7b5d4@hagrid>
Message-ID: <14491.24420.290166.434941@anthem.cnri.reston.va.us>

>>>>> "FL" == Fredrik Lundh <effbot@telia.com> writes:

    FL> what I had in mind was to let mailman provide a "unified
    FL> interface" to two or more different mail sources...

    FL> (e.g. people sign up to python-checkins, and gets
    FL> messages from either python-checkins-standard or
    FL> python-checkins-slow_modem, depending on a user-
    FL> dependent setting...)

Cool idea!

    FL> but no, you don't have to implement that now ;-)

Phew! :)

-Barry


From gstein@lyra.org  Sat Feb  5 03:13:35 2000
From: gstein@lyra.org (Greg Stein)
Date: Fri, 4 Feb 2000 19:13:35 -0800 (PST)
Subject: [Python-checkins] Insanity!
In-Reply-To: <l03102812b4c0f7fd57a4@[193.78.237.128]>
Message-ID: <Pine.LNX.4.10.10002041401440.8462-100000@nebula.lyra.org>

On Fri, 4 Feb 2000, Just van Rossum wrote:
> At 4:27 PM -0500 04-02-2000, Barry A. Warsaw wrote:
> >What Greg wanted, and what I implemented, was trimming the diffs if
> >they were larger than x lines, where x currently == 1000.  In that
> >case, we trim the diffs to 40 lines.  This doesn't help you if there
> >are tons of smaller diffs in a digest.  I'm happy to tweak the numbers
> >if people want, but I'm not going to do any significant work on the
> >script (no time).
> 
> It seems today's situation proved that this is not the right approach...
> 
> Wouldn't it make much more sense to not send *any* diffs, but install
> view-cvs.py or whatever it's called on *.python.org?

As Barry mentioned, it is installed.

> Or otherwise: remove the feature, and reinstate it when someone has gotten
> 'round to implement a sane version.

Having the diff *actively* put in front of your face is much better than
needing to go look it up through a different mechanism (e.g. web browser
or the CVS command line). When a person gets a mail message with a notice
of change *and* the change, then they can review it right then and there.

I reviewed Ka-Ping's first change. Haven't done the second so far. I can
basically guarantee that wouldn't happen if I had to go and use a separate
tool on all those files.

Actively posting diffs is a great thing. It can definitely assist in
knowing that people will be reviewing the change. That size is needed for
a good review. More eyeballs, better software.

IMO, if the size bothers you, then unsubscribe. ViewCVS will show you when
things last changed. You can always go and look to see what has changed
within the past N days/weeks/whatever.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/



From gstein@lyra.org  Sat Feb  5 10:58:29 2000
From: gstein@lyra.org (Greg Stein)
Date: Sat, 5 Feb 2000 02:58:29 -0800 (PST)
Subject: [Python-checkins] truncation limit (was: Insanity!)
In-Reply-To: <14491.19124.921076.656526@anthem.cnri.reston.va.us>
Message-ID: <Pine.LNX.4.10.10002050256440.8462-100000@nebula.lyra.org>

On Fri, 4 Feb 2000 bwarsaw@cnri.reston.va.us wrote:
>...
>     JvR> Or otherwise: remove the feature, and reinstate it when
>     JvR> someone has gotten 'round to implement a sane version.
> 
> Or chop the truncation limit down from 1000 lines.  Would 100 make
> more sense?

I found that was a bit too small. A lot of simple changes can easily beat
100 lines. Just think about moving a few functions in a file. Or maybe
updating a structure and its uses. Or ...

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/



From gstein@lyra.org  Sat Feb  5 11:08:00 2000
From: gstein@lyra.org (Greg Stein)
Date: Sat, 5 Feb 2000 03:08:00 -0800 (PST)
Subject: [Python-checkins] viewcvs speed (was: Insanity!)
In-Reply-To: <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
Message-ID: <Pine.LNX.4.10.10002050259441.8462-100000@nebula.lyra.org>

On Fri, 4 Feb 2000, Fredrik Lundh wrote:
>...
> > Wouldn't it make much more sense to not send *any* diffs, but install
> > view-cvs.py or whatever it's called on *.python.org?
> 
> it's already there: http://cvs.python.org/cgi-bin/viewcvs.cgi/
> 
> but clicking around in there takes ages.

viewcvs.cgi is about 2300 lines of Python code. Unfortunately, it gets
parsed on each CGI invocation. There are two alternatives:

1) tiny stub which imports a module to do the work (with the hope that the
   resulting .pyc can be cached)
2) use my Python-in-a-script approach at:
      http://www.lyra.org/greg/python/index.html#dev

The former is harder for people to install. The latter is neat, but would
be harder for people to tweak the source and regenerate.

As a result, I decided to leave viewcvs.cgi as one big honker file that
makes it a real piece of cake for installation, editing, and use. But it
runs a bit slower :-)

Note: I think it is also the cvs.python.org machine. I get good speed on
my box (Linux, K6 200MHz).

>  maybe the script
> could be tweaked to include complete URL's instead of diffs,
> if the diff is larger than, say, 50 lines.  e.g:
> 
> http://cvs.python.org/cgi-bin/viewcvs.cgi/python/dist/src/Lib/bisect.py?rev=1.4&content-type=text/vnd.viewcvs-markup

Ooh. Sweet idea! In fact, I think that I'm gonna go and update my system
here to do that. Thanx!

However: I still woult NOT recommend omitting the diffs. I think our goal
is to increase the ease and propability that people will actually review
the checkins. Throwing a barrier in there such as "you must go use 'cvs
diff' to see the change" or "go use viewcvs to see it" or whatever, will
just serve to raise the barrier for a review. As long as notification and
change are wrapped into a single email, then our barrier is lower and
we'll get more eyeballs looking at the changes.

> > Or otherwise: remove the feature, and reinstate it when someone has gotten
> > 'round to implement a sane version.
> 
> or force everyone to get a cable modem ;-)
> 
> (maybe we could trick Barry into adding some kind of "optional
> filter" mechanism to mailman, so people can pick their favourite
> format?)

I've been wanting to send out the checkin email as an HTML email. The
things you could do! But Barry chastised me heavily for even mentioning
that. I don't think he likes HTML email :-)

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/



From tim_one@email.msn.com  Sat Feb  5 21:48:10 2000
From: tim_one@email.msn.com (Tim Peters)
Date: Sat, 5 Feb 2000 16:48:10 -0500
Subject: [Python-checkins] RE: Insanity!
In-Reply-To: <20000205170029.B92A91CDA7@dinsdale.python.org>
Message-ID: <002101bf7022$b27b7ea0$b7a0143f@tim>

Hey, *nobody* has a slower web connection than me, and the size of the
checkin digests doesn't bother me at all.  To the contrary, I was delighted
to have such a convenient way to see all the goodness Ping had done to the
docstrings.

At first I shared this complaint with Just:

> For me, the log messages are much more important than the diffs. I
> want to read what file has changed, and why it has changed. In most
> cases I don't care about the details, and if I do, it's easy enough
> to go through cvs.  Now, because I'm just keeping a loose eye on
> what's going on, I subscribe as digest. That's wonderful: every day
> I get one email with a list of changes with their comments. However,
> with the diff stuff in place, I have to wade through screenfuls of
> diffs that I don't care about to get to the log messages that I *do*
> care about. They almost disappear in the mud.

After about three weeks, it suddenly occurred to me that my mail reader has
a "search" button -- I simply rarely used it before!  Now I just zip over
the patches that don't interest me.

> ...
> *) I've never seen the "voting" you alluded to earlier, probably
> because that took place on a list that I'm not on. I find that
> slightly odd...

I think it was the Python-Dev list.  Dutch people aren't allowed on that,
though <wink>.

ain't-broke-don't-fix-ly y'rs  - tim




From a.eyre@optichrome.com  Mon Feb  7 11:01:51 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Mon, 7 Feb 2000 11:01:51 -0000
Subject: [Python-checkins] Insanity!
In-Reply-To: <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
Message-ID: <000b01bf715a$bc7eb8c0$3acbd9c2@peridot.optichrome.com>

> but clicking around in there takes ages.  maybe the script
> could be tweaked to include complete URL's instead of diffs,
> if the diff is larger than, say, 50 lines.  e.g:
>
>
http://cvs.python.org/cgi-bin/viewcvs.cgi/python/dist/src/Lib/bisect.py?rev=
1.4&content-type=text/vnd.viewcvs-markup

This seems like a reasonable compromise.

-----------------------------------------------------------------
Adrian Eyre <a.eyre@optichrome.com> - http://www.optichrome.com



From a.eyre@optichrome.com  Mon Feb  7 11:04:49 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Mon, 7 Feb 2000 11:04:49 -0000
Subject: [Python-checkins] RE: Insanity!
In-Reply-To: <002101bf7022$b27b7ea0$b7a0143f@tim>
Message-ID: <000c01bf715b$269fe940$3acbd9c2@peridot.optichrome.com>

>> *) I've never seen the "voting" you alluded to earlier, probably
>> because that took place on a list that I'm not on. I find that
>> slightly odd...

> I think it was the Python-Dev list.  Dutch people aren't allowed on that,
> though <wink>.

I remember the voting that took place, and I'm not on the python-dev list.
I'm sure it was on this list.

-----------------------------------------------------------------
Adrian Eyre <a.eyre@optichrome.com> - http://www.optichrome.com 



From fdrake@acm.org  Mon Feb  7 14:42:38 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Mon, 7 Feb 2000 09:42:38 -0500 (EST)
Subject: [Python-checkins] truncation limit (was: Insanity!)
In-Reply-To: <Pine.LNX.4.10.10002050256440.8462-100000@nebula.lyra.org>
References: <14491.19124.921076.656526@anthem.cnri.reston.va.us>
 <Pine.LNX.4.10.10002050256440.8462-100000@nebula.lyra.org>
Message-ID: <14494.55774.288636.108248@weyr.cnri.reston.va.us>

Greg Stein writes:
 > I found that was a bit too small. A lot of simple changes can easily beat
 > 100 lines. Just think about moving a few functions in a file. Or maybe
 > updating a structure and its uses. Or ...

  The description of the checkin should be sufficient for such things
most of the time.
  Let's trim the diffs more agressively and cut our losses in this
thread.  It taken way to long to decide on this.


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From fdrake@acm.org  Mon Feb  7 14:44:51 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Mon, 7 Feb 2000 09:44:51 -0500 (EST)
Subject: [Python-checkins] viewcvs speed (was: Insanity!)
In-Reply-To: <Pine.LNX.4.10.10002050259441.8462-100000@nebula.lyra.org>
References: <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
 <Pine.LNX.4.10.10002050259441.8462-100000@nebula.lyra.org>
Message-ID: <14494.55907.344044.868234@weyr.cnri.reston.va.us>

Greg Stein writes:
 > I've been wanting to send out the checkin email as an HTML email. The
 > things you could do! But Barry chastised me heavily for even mentioning
 > that. I don't think he likes HTML email :-)

  A lot of us don't!


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From bwarsaw@cnri.reston.va.us (Barry A. Warsaw)  Mon Feb  7 14:58:54 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw) (Barry A. Warsaw)
Date: Mon, 7 Feb 2000 09:58:54 -0500 (EST)
Subject: [Python-checkins] viewcvs speed (was: Insanity!)
References: <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
 <Pine.LNX.4.10.10002050259441.8462-100000@nebula.lyra.org>
Message-ID: <14494.56750.206497.330764@anthem.cnri.reston.va.us>

>>>>> "GS" == Greg Stein <gstein@lyra.org> writes:

    GS> I've been wanting to send out the checkin email as an HTML
    GS> email. The things you could do! But Barry chastised me heavily
    GS> for even mentioning that. I don't think he likes HTML email
    GS> :-)

Ug!  Okay, I'll admit I'm still a dinosaur.  I don't read my mail with
any of them fancy shmancy browser thingies that's all the rage with
the kids these days.

:)


From guido@cnri.reston.va.us  Mon Feb  7 15:29:45 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 7 Feb 2000 10:29:45 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/PCbuild bsddb.dsp,1.6,1.7
Message-ID: <200002071529.KAA17701@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/PCbuild
In directory eric:/projects/python/develop/guido/src/PCbuild

Modified Files:
	bsddb.dsp 
Log Message:
Same patch (also by Mark Hammond) for this straggler project file as
for the other projects, to move the x86 project names back to what
they were.


Index: bsddb.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/bsddb.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** bsddb.dsp	2000/01/20 21:31:41	1.6
--- bsddb.dsp	2000/02/07 15:29:43	1.7
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "bsddb - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "bsddb - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "bsddb - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "bsddb - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "bsddb - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "bsddb - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "bsddb - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "bsddb - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
***************
*** 30,34 ****
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "bsddb - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "bsddb - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 61,65 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "bsddb - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 61,65 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "bsddb - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 160,165 ****
  # Begin Target
  
! # Name "bsddb - Win32 x86 Release"
! # Name "bsddb - Win32 x86 Debug"
  # Name "bsddb - Win32 Alpha Debug"
  # Name "bsddb - Win32 Alpha Release"
--- 160,165 ----
  # Begin Target
  
! # Name "bsddb - Win32 Release"
! # Name "bsddb - Win32 Debug"
  # Name "bsddb - Win32 Alpha Debug"
  # Name "bsddb - Win32 Alpha Release"
***************
*** 168,174 ****
  SOURCE=..\Modules\bsddbmodule.c
  
! !IF  "$(CFG)" == "bsddb - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "bsddb - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "bsddb - Win32 Alpha Debug"
--- 168,174 ----
  SOURCE=..\Modules\bsddbmodule.c
  
! !IF  "$(CFG)" == "bsddb - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "bsddb - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "bsddb - Win32 Alpha Debug"



From fdrake@weyr.cnri.reston.va.us  Mon Feb  7 17:15:51 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 7 Feb 2000 12:15:51 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_gdbm.py,1.2,1.3
Message-ID: <200002071715.MAA17619@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/test
In directory weyr:/home/fdrake/projects/python/Lib/test

Modified Files:
	test_gdbm.py 
Log Message:

Added test case for accessing gsbm database by key after it's closed;
it should raise gdbm.error.


Index: test_gdbm.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/test/test_gdbm.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** test_gdbm.py	1996/12/20 22:36:49	1.2
--- test_gdbm.py	2000/02/07 17:15:48	1.3
***************
*** 6,10 ****
  import gdbm
  from gdbm import error
! from test_support import verbose
  
  filename= '/tmp/delete_me'
--- 6,10 ----
  import gdbm
  from gdbm import error
! from test_support import verbose, TestFailed
  
  filename= '/tmp/delete_me'
***************
*** 19,22 ****
--- 19,28 ----
  g.has_key('a')
  g.close()
+ try:
+     g['a']
+ except error:
+     pass
+ else:
+     raise TestFailed, "expected gdbm.error accessing closed database"
  g = gdbm.open(filename, 'r')
  g.close()



From fdrake@weyr.cnri.reston.va.us  Mon Feb  7 17:19:44 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 7 Feb 2000 12:19:44 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules gdbmmodule.c,2.19,2.20
Message-ID: <200002071719.MAA17668@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory weyr:/home/fdrake/projects/python/Modules

Modified Files:
	gdbmmodule.c 
Log Message:

Protect against core dumps in gdbm: don't allow access by key once the 
database is closed.  Raise gdbm.error instead.

Bug report #198 submitted by Barry Haddow <bhaddow@orbism.com>.


Index: gdbmmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/gdbmmodule.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** gdbmmodule.c	1998/12/04 18:49:49	2.19
--- gdbmmodule.c	2000/02/07 17:19:41	2.20
***************
*** 156,160 ****
  	if (!PyArg_Parse(key, "s#", &krec.dptr, &krec.dsize) )
  		return NULL;
! 	
  	drec = gdbm_fetch(dp->di_dbm, krec);
  	if ( drec.dptr == 0 ) {
--- 156,165 ----
  	if (!PyArg_Parse(key, "s#", &krec.dptr, &krec.dsize) )
  		return NULL;
! 
! 	if (dp->di_dbm == NULL) {
! 		PyErr_SetString(DbmError,
! 				"GDBM object has already been closed");
! 		return NULL;
! 	}
  	drec = gdbm_fetch(dp->di_dbm, krec);
  	if ( drec.dptr == 0 ) {
***************
*** 181,185 ****
  	}
          if (dp->di_dbm == NULL) {
!                  PyErr_SetString(DbmError, "GDBM object has already been closed"); 
                   return -1; 
          }
--- 186,191 ----
  	}
          if (dp->di_dbm == NULL) {
!                  PyErr_SetString(DbmError,
!                                  "GDBM object has already been closed"); 
                   return -1; 
          }



From gstein@lyra.org  Tue Feb  8 03:03:18 2000
From: gstein@lyra.org (Greg Stein)
Date: Mon, 7 Feb 2000 19:03:18 -0800 (PST)
Subject: [Python-checkins] truncation limit
In-Reply-To: <14494.55774.288636.108248@weyr.cnri.reston.va.us>
Message-ID: <Pine.LNX.4.10.10002071851220.8462-100000@nebula.lyra.org>

On Mon, 7 Feb 2000, Fred L. Drake, Jr. wrote:
> Greg Stein writes:
>  > I found that was a bit too small. A lot of simple changes can easily beat
>  > 100 lines. Just think about moving a few functions in a file. Or maybe
>  > updating a structure and its uses. Or ...
> 
>   The description of the checkin should be sufficient for such things
> most of the time.

People are using python-checkins for one of two purposes:

1) monitoring what/how Python is changing
2) code reviewing the changes

Sending the diffs within the email supports (2). Aggressive trimming
simply removes that possibility, so you may as well not send any diffs.
Note that sending full diffs does not obviate (1); it merely provides
additional detail that people may not be interested in.

IMO, I think it is better to enable both purposes.

Guido is excellent at ensuring code is solid before checkin, but mistakes
can and do happen. In addition, there have been proposals to open up
checkins to more individuals. Or, to do some more up-front work to assist
Guido which may end up with the case of Guido not personally reviewing the
code as well and letting something slip by. Additional code review can
only help!

>   Let's trim the diffs more agressively and cut our losses in this
> thread.  It taken way to long to decide on this.

It took zero time. It was decided a month or so ago :-). You mean it is
taking too long to try and *change* the decision :-).

Enough bantering...

Let's get down to the underlying problem. People don't like the
possibility of large emails arriving in their inbox. That is what this
thread is all about. There isn't anything about "it is best to remove them
because <X>." There is *no* reason to remove the diffs, other than to
reduce the size of the emails. I say: read the checkin comment, then
ignore the diffs if you don't want to read them.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/



From fdrake@weyr.cnri.reston.va.us  Thu Feb 10 15:31:10 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 10 Feb 2000 10:31:10 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_zlib.py,1.6,1.7
Message-ID: <200002101531.KAA00186@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/test
In directory weyr:/home/fdrake/projects/python/Lib/test

Modified Files:
	test_zlib.py 
Log Message:

Make this pass the -tt test.


Index: test_zlib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/test/test_zlib.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** test_zlib.py	1999/03/22 19:23:17	1.6
--- test_zlib.py	2000/02/10 15:31:07	1.7
***************
*** 81,92 ****
  for sync in [zlib.Z_NO_FLUSH, zlib.Z_SYNC_FLUSH, zlib.Z_FULL_FLUSH]:
      for level in range(10):
! 	obj = zlib.compressobj( level )
!     	d = obj.compress( buf[:3000] )
! 	d = d + obj.flush( sync )
! 	d = d + obj.compress( buf[3000:] )
! 	d = d + obj.flush()
! 	if zlib.decompress(d) != buf:
! 	    print "Decompress failed: flush mode=%i, level=%i" % (sync,level)
! 	del obj
  
  def ignore():
--- 81,92 ----
  for sync in [zlib.Z_NO_FLUSH, zlib.Z_SYNC_FLUSH, zlib.Z_FULL_FLUSH]:
      for level in range(10):
!         obj = zlib.compressobj( level )
!         d = obj.compress( buf[:3000] )
!         d = d + obj.flush( sync )
!         d = d + obj.compress( buf[3000:] )
!         d = d + obj.flush()
!         if zlib.decompress(d) != buf:
!             print "Decompress failed: flush mode=%i, level=%i" % (sync,level)
!         del obj
  
  def ignore():



From fdrake@weyr.cnri.reston.va.us  Thu Feb 10 16:21:13 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 10 Feb 2000 11:21:13 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
Message-ID: <200002101621.LAA00758@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	string.py 
Log Message:

Detabify.

I ran "expand" instead of using Skip's patch, but it's all the same.


Index: string.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/string.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** string.py	2000/02/04 15:28:41	1.46
--- string.py	2000/02/10 16:21:11	1.47
***************
*** 198,205 ****
      """
      if type(s) == _StringType:
! 	return _float(s)
      else:
! 	raise TypeError('argument 1: expected string, %s found' %
! 			type(s).__name__)
  
  # Convert string to integer
--- 198,205 ----
      """
      if type(s) == _StringType:
!         return _float(s)
      else:
!         raise TypeError('argument 1: expected string, %s found' %
!                         type(s).__name__)
  
  # Convert string to integer
***************
*** 216,231 ****
      """
      try:
! 	s = args[0]
      except IndexError:
! 	raise TypeError('function requires at least 1 argument: %d given' %
! 			len(args))
      # Don't catch type error resulting from too many arguments to int().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
! 	return _apply(_int, args)
      else:
! 	raise TypeError('argument 1: expected string, %s found' %
! 			type(s).__name__)
  
  
--- 216,231 ----
      """
      try:
!         s = args[0]
      except IndexError:
!         raise TypeError('function requires at least 1 argument: %d given' %
!                         len(args))
      # Don't catch type error resulting from too many arguments to int().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
!         return _apply(_int, args)
      else:
!         raise TypeError('argument 1: expected string, %s found' %
!                         type(s).__name__)
  
  
***************
*** 244,259 ****
      """
      try:
! 	s = args[0]
      except IndexError:
! 	raise TypeError('function requires at least 1 argument: %d given' %
! 			len(args))
      # Don't catch type error resulting from too many arguments to long().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
! 	return _apply(_long, args)
      else:
! 	raise TypeError('argument 1: expected string, %s found' %
! 			type(s).__name__)
  
  
--- 244,259 ----
      """
      try:
!         s = args[0]
      except IndexError:
!         raise TypeError('function requires at least 1 argument: %d given' %
!                         len(args))
      # Don't catch type error resulting from too many arguments to long().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
!         return _apply(_long, args)
      else:
!         raise TypeError('argument 1: expected string, %s found' %
!                         type(s).__name__)
  
  
***************
*** 297,302 ****
      half = n/2
      if n%2 and width%2:
! 	# This ensures that center(center(s, i), j) = center(s, j)
! 	half = half+1
      return ' '*half +  s + ' '*(n-half)
  
--- 297,302 ----
      half = n/2
      if n%2 and width%2:
!         # This ensures that center(center(s, i), j) = center(s, j)
!         half = half+1
      return ' '*half +  s + ' '*(n-half)
  
***************
*** 317,321 ****
      sign = ''
      if s[0] in ('-', '+'):
! 	sign, s = s[0], s[1:]
      return sign + '0'*(width-n) + s
  
--- 317,321 ----
      sign = ''
      if s[0] in ('-', '+'):
!         sign, s = s[0], s[1:]
      return sign + '0'*(width-n) + s
  
***************
*** 332,341 ****
      res = line = ''
      for c in s:
! 	if c == '\t':
! 	    c = ' '*(tabsize - len(line) % tabsize)
! 	line = line + c
! 	if c == '\n':
! 	    res = res + line
! 	    line = ''
      return res + line
  
--- 332,341 ----
      res = line = ''
      for c in s:
!         if c == '\t':
!             c = ' '*(tabsize - len(line) % tabsize)
!         line = line + c
!         if c == '\n':
!             res = res + line
!             line = ''
      return res + line
  
***************
*** 386,397 ****
      """
      if len(fromstr) != len(tostr):
! 	raise ValueError, "maketrans arguments must have same length"
      global _idmapL
      if not _idmapL:
! 	_idmapL = map(None, _idmap)
      L = _idmapL[:]
      fromstr = map(ord, fromstr)
      for i in range(len(fromstr)):
! 	L[fromstr[i]] = tostr[i]
      return joinfields(L, "")
  
--- 386,397 ----
      """
      if len(fromstr) != len(tostr):
!         raise ValueError, "maketrans arguments must have same length"
      global _idmapL
      if not _idmapL:
!         _idmapL = map(None, _idmap)
      L = _idmapL[:]
      fromstr = map(ord, fromstr)
      for i in range(len(fromstr)):
!         L[fromstr[i]] = tostr[i]
      return joinfields(L, "")
  
***************
*** 427,429 ****
      letters = lowercase + uppercase
  except ImportError:
!     pass					  # Use the original versions
--- 427,429 ----
      letters = lowercase + uppercase
  except ImportError:
!     pass                                          # Use the original versions



From fdrake@weyr.cnri.reston.va.us  Thu Feb 10 17:17:17 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 10 Feb 2000 12:17:17 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib httplib.py,1.13,1.14 mailbox.py,1.17,1.18 mimetypes.py,1.10,1.11 rfc822.py,1.45,1.46 shelve.py,1.12,1.13 stringold.py,1.43,1.44 urllib2.py,1.2,1.3 whichdb.py,1.5,1.6
Message-ID: <200002101717.MAA06646@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	httplib.py mailbox.py mimetypes.py rfc822.py shelve.py 
	stringold.py urllib2.py whichdb.py 
Log Message:
Untabify to pass the -tt test.

Index: httplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/httplib.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** httplib.py	1999/12/07 21:35:20	1.13
--- httplib.py	2000/02/10 17:17:13	1.14
***************
*** 45,69 ****
  class FakeSocket:
      def __init__(self, sock, ssl):
! 	self.__sock = sock
! 	self.__ssl = ssl
! 	return
  
!     def makefile(self, mode):		# hopefully, never have to write
! 	msgbuf = ""
! 	while 1:
! 	    try:
! 		msgbuf = msgbuf + self.__ssl.read()
! 	    except socket.sslerror, msg:
! 		break
! 	return StringIO(msgbuf)
  
      def send(self, stuff, flags = 0):
! 	return self.__ssl.write(stuff)
  
      def recv(self, len = 1024, flags = 0):
! 	return self.__ssl.read(len)
  
      def __getattr__(self, attr):
! 	return getattr(self.__sock, attr)
  
  class HTTP:
--- 45,69 ----
  class FakeSocket:
      def __init__(self, sock, ssl):
!         self.__sock = sock
!         self.__ssl = ssl
!         return
  
!     def makefile(self, mode):           # hopefully, never have to write
!         msgbuf = ""
!         while 1:
!             try:
!                 msgbuf = msgbuf + self.__ssl.read()
!             except socket.sslerror, msg:
!                 break
!         return StringIO(msgbuf)
  
      def send(self, stuff, flags = 0):
!         return self.__ssl.write(stuff)
  
      def recv(self, len = 1024, flags = 0):
!         return self.__ssl.read(len)
  
      def __getattr__(self, attr):
!         return getattr(self.__sock, attr)
  
  class HTTP:

Index: mailbox.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mailbox.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** mailbox.py	1999/12/14 22:18:37	1.17
--- mailbox.py	2000/02/10 17:17:13	1.18
***************
*** 9,276 ****
  class _Mailbox:
  
! 	def __init__(self, fp):
! 		self.fp = fp
! 		self.seekp = 0
! 
! 	def seek(self, pos, whence=0):
! 		if whence==1:		# Relative to current position
! 			self.pos = self.pos + pos
! 		if whence==2:		# Relative to file's end
! 			self.pos = self.stop + pos
! 		else:			# Default - absolute position
! 			self.pos = self.start + pos
! 
! 	def next(self):
! 		while 1:
! 			self.fp.seek(self.seekp)
! 			try:
! 				self._search_start()
! 			except EOFError:
! 				self.seekp = self.fp.tell()
! 				return None
! 			start = self.fp.tell()
! 			self._search_end()
! 			self.seekp = stop = self.fp.tell()
! 			if start <> stop:
! 				break
! 		return rfc822.Message(_Subfile(self.fp, start, stop))
  
  class _Subfile:
  
! 	def __init__(self, fp, start, stop):
! 		self.fp = fp
! 		self.start = start
! 		self.stop = stop
! 		self.pos = self.start
! 
! 	def read(self, length = None):
! 		if self.pos >= self.stop:
! 			return ''
! 		remaining = self.stop - self.pos
! 		if length is None or length < 0:
! 			length = remaining
! 		elif length > remaining:
! 			length = remaining
! 		self.fp.seek(self.pos)
! 		data = self.fp.read(length)
! 		self.pos = self.fp.tell()
! 		return data
! 
! 	def readline(self, length = None):
! 		if self.pos >= self.stop:
! 			return ''
! 		if length is None:
! 			length = self.stop - self.pos
! 		self.fp.seek(self.pos)
! 		data = self.fp.readline(length)
! 		self.pos = self.fp.tell()
! 		return data
  
          def readlines(self, sizehint = -1):
! 		lines = []
! 		while 1:
! 			line = self.readline()
! 			if not line:
! 				break
! 			lines.append(line)
! 			if sizehint >= 0:
! 				sizehint = sizehint - len(line)
! 				if sizehint <= 0:
! 					break
! 		return lines
! 
! 	def tell(self):
! 		return self.pos - self.start
! 
! 	def seek(self, pos, whence=0):
! 		if whence == 0:
! 			self.pos = self.start + pos
! 		elif whence == 1:
! 			self.pos = self.pos + pos
! 		elif whence == 2:
! 			self.pos = self.stop + pos
  
! 	def close(self):
! 		del self.fp
  
  class UnixMailbox(_Mailbox):
  
! 	def _search_start(self):
! 		while 1:
! 			line = self.fp.readline()
! 			if not line:
! 				raise EOFError
! 			if line[:5] == 'From ' and self._isrealfromline(line):
! 				return
! 
! 	def _search_end(self):
! 		while 1:
! 			pos = self.fp.tell()
! 			line = self.fp.readline()
! 			if not line:
! 				return
! 			if line[:5] == 'From ' and self._isrealfromline(line):
! 				self.fp.seek(pos)
! 				return
! 
! 	# An overridable mechanism to test for From-line-ness.
! 	# You can either specify a different regular expression
! 	# or define a whole new _isrealfromline() method.
! 	# Note that this only gets called for lines starting with
! 	# the 5 characters "From ".
! 
! 	_fromlinepattern = r"From \s*[^\s]+\s+\w\w\w\s+\w\w\w\s+\d?\d\s+" \
! 			   r"\d?\d:\d\d(:\d\d)?(\s+[^\s]+)?\s+\d\d\d\d\s*$"
! 	_regexp = None
! 
! 	def _isrealfromline(self, line):
! 		if not self._regexp:
! 			import re
! 			self._regexp = re.compile(self._fromlinepattern)
! 		return self._regexp.match(line)
  
  class MmdfMailbox(_Mailbox):
  
! 	def _search_start(self):
! 		while 1:
! 			line = self.fp.readline()
! 			if not line:
! 				raise EOFError
! 			if line[:5] == '\001\001\001\001\n':
! 				return
! 
! 	def _search_end(self):
! 		while 1:
! 			pos = self.fp.tell()
! 			line = self.fp.readline()
! 			if not line:
! 				return
! 			if line == '\001\001\001\001\n':
! 				self.fp.seek(pos)
! 				return
  
  class MHMailbox:
  
! 	def __init__(self, dirname):
! 		import re
! 		pat = re.compile('^[0-9][0-9]*$')
! 		self.dirname = dirname
! 		files = os.listdir(self.dirname)
! 		self.boxes = []
! 		for f in files:
! 			if pat.match(f):
! 				self.boxes.append(f)
! 
! 	def next(self):
! 		if not self.boxes:
! 			return None
! 		fn = self.boxes[0]
! 		del self.boxes[0]
! 		fp = open(os.path.join(self.dirname, fn))
! 		return rfc822.Message(fp)
  
  class Maildir:
  
! 	# Qmail directory mailbox
  
! 	def __init__(self, dirname):
! 		import string
! 		self.dirname = dirname
! 		self.boxes = []
! 
! 		# check for new mail
! 		newdir = os.path.join(self.dirname, 'new')
! 		for file in os.listdir(newdir):
! 			if len(string.split(file, '.')) > 2:
! 				self.boxes.append(os.path.join(newdir, file))
! 
! 		# Now check for current mail in this maildir
! 		curdir = os.path.join(self.dirname, 'cur')
! 		for file in os.listdir(curdir):
! 			if len(string.split(file, '.')) > 2:
! 				self.boxes.append(os.path.join(curdir, file))
! 
! 	def next(self):
! 		if not self.boxes:
! 			return None
! 		fn = self.boxes[0]
! 		del self.boxes[0]
! 		fp = open(os.path.join(self.dirname, fn))
! 		return rfc822.Message(fp)
  
  class BabylMailbox(_Mailbox):
  
! 	def _search_start(self):
! 		while 1:
! 			line = self.fp.readline()
! 			if not line:
! 				raise EOFError
! 			if line == '*** EOOH ***\n':
! 				return
! 
! 	def _search_end(self):
! 		while 1:
! 			pos = self.fp.tell()
! 			line = self.fp.readline()
! 			if not line:
! 				return
! 			if line == '\037\014\n':
! 				self.fp.seek(pos)
! 				return
  
  
  def _test():
! 	import time
! 	import sys
! 	import string
! 	import os
! 
! 	args = sys.argv[1:]
! 	if not args:
! 		for key in 'MAILDIR', 'MAIL', 'LOGNAME', 'USER':
! 			if os.environ.has_key(key):
! 				mbox = os.environ[key]
! 				break
! 		else:
! 			print "$MAIL, $LOGNAME nor $USER set -- who are you?"
! 			return
! 	else:
! 		mbox = args[0]
! 	if mbox[:1] == '+':
! 		mbox = os.environ['HOME'] + '/Mail/' + mbox[1:]
! 	elif not '/' in mbox:
! 		mbox = '/usr/mail/' + mbox
! 	if os.path.isdir(mbox):
! 		if os.path.isdir(os.path.join(mbox, 'cur')):
! 			mb = Maildir(mbox)
! 		else:
! 			mb = MHMailbox(mbox)
! 	else:
! 		fp = open(mbox, 'r')
! 		mb = UnixMailbox(fp)
! 	
! 	msgs = []
! 	while 1:
! 		msg = mb.next()
! 		if msg is None:
! 			break
! 		msgs.append(msg)
! 		if len(args) <= 1:
! 			msg.fp = None
! 	if len(args) > 1:
! 		num = string.atoi(args[1])
! 		print 'Message %d body:'%num
! 		msg = msgs[num-1]
! 		msg.rewindbody()
! 		sys.stdout.write(msg.fp.read())
! 	else:
! 		print 'Mailbox',mbox,'has',len(msgs),'messages:'
! 		for msg in msgs:
! 			f = msg.getheader('from') or ""
! 			s = msg.getheader('subject') or ""
! 			d = msg.getheader('date') or ""
! 			print '%20.20s   %18.18s   %-30.30s'%(f, d[5:], s)
  
  
  if __name__ == '__main__':
! 	_test()
--- 9,276 ----
  class _Mailbox:
  
!         def __init__(self, fp):
!                 self.fp = fp
!                 self.seekp = 0
! 
!         def seek(self, pos, whence=0):
!                 if whence==1:           # Relative to current position
!                         self.pos = self.pos + pos
!                 if whence==2:           # Relative to file's end
!                         self.pos = self.stop + pos
!                 else:                   # Default - absolute position
!                         self.pos = self.start + pos
! 
!         def next(self):
!                 while 1:
!                         self.fp.seek(self.seekp)
!                         try:
!                                 self._search_start()
!                         except EOFError:
!                                 self.seekp = self.fp.tell()
!                                 return None
!                         start = self.fp.tell()
!                         self._search_end()
!                         self.seekp = stop = self.fp.tell()
!                         if start <> stop:
!                                 break
!                 return rfc822.Message(_Subfile(self.fp, start, stop))
  
  class _Subfile:
  
!         def __init__(self, fp, start, stop):
!                 self.fp = fp
!                 self.start = start
!                 self.stop = stop
!                 self.pos = self.start
! 
!         def read(self, length = None):
!                 if self.pos >= self.stop:
!                         return ''
!                 remaining = self.stop - self.pos
!                 if length is None or length < 0:
!                         length = remaining
!                 elif length > remaining:
!                         length = remaining
!                 self.fp.seek(self.pos)
!                 data = self.fp.read(length)
!                 self.pos = self.fp.tell()
!                 return data
! 
!         def readline(self, length = None):
!                 if self.pos >= self.stop:
!                         return ''
!                 if length is None:
!                         length = self.stop - self.pos
!                 self.fp.seek(self.pos)
!                 data = self.fp.readline(length)
!                 self.pos = self.fp.tell()
!                 return data
  
          def readlines(self, sizehint = -1):
!                 lines = []
!                 while 1:
!                         line = self.readline()
!                         if not line:
!                                 break
!                         lines.append(line)
!                         if sizehint >= 0:
!                                 sizehint = sizehint - len(line)
!                                 if sizehint <= 0:
!                                         break
!                 return lines
! 
!         def tell(self):
!                 return self.pos - self.start
! 
!         def seek(self, pos, whence=0):
!                 if whence == 0:
!                         self.pos = self.start + pos
!                 elif whence == 1:
!                         self.pos = self.pos + pos
!                 elif whence == 2:
!                         self.pos = self.stop + pos
  
!         def close(self):
!                 del self.fp
  
  class UnixMailbox(_Mailbox):
  
!         def _search_start(self):
!                 while 1:
!                         line = self.fp.readline()
!                         if not line:
!                                 raise EOFError
!                         if line[:5] == 'From ' and self._isrealfromline(line):
!                                 return
! 
!         def _search_end(self):
!                 while 1:
!                         pos = self.fp.tell()
!                         line = self.fp.readline()
!                         if not line:
!                                 return
!                         if line[:5] == 'From ' and self._isrealfromline(line):
!                                 self.fp.seek(pos)
!                                 return
! 
!         # An overridable mechanism to test for From-line-ness.
!         # You can either specify a different regular expression
!         # or define a whole new _isrealfromline() method.
!         # Note that this only gets called for lines starting with
!         # the 5 characters "From ".
! 
!         _fromlinepattern = r"From \s*[^\s]+\s+\w\w\w\s+\w\w\w\s+\d?\d\s+" \
!                            r"\d?\d:\d\d(:\d\d)?(\s+[^\s]+)?\s+\d\d\d\d\s*$"
!         _regexp = None
! 
!         def _isrealfromline(self, line):
!                 if not self._regexp:
!                         import re
!                         self._regexp = re.compile(self._fromlinepattern)
!                 return self._regexp.match(line)
  
  class MmdfMailbox(_Mailbox):
  
!         def _search_start(self):
!                 while 1:
!                         line = self.fp.readline()
!                         if not line:
!                                 raise EOFError
!                         if line[:5] == '\001\001\001\001\n':
!                                 return
! 
!         def _search_end(self):
!                 while 1:
!                         pos = self.fp.tell()
!                         line = self.fp.readline()
!                         if not line:
!                                 return
!                         if line == '\001\001\001\001\n':
!                                 self.fp.seek(pos)
!                                 return
  
  class MHMailbox:
  
!         def __init__(self, dirname):
!                 import re
!                 pat = re.compile('^[0-9][0-9]*$')
!                 self.dirname = dirname
!                 files = os.listdir(self.dirname)
!                 self.boxes = []
!                 for f in files:
!                         if pat.match(f):
!                                 self.boxes.append(f)
! 
!         def next(self):
!                 if not self.boxes:
!                         return None
!                 fn = self.boxes[0]
!                 del self.boxes[0]
!                 fp = open(os.path.join(self.dirname, fn))
!                 return rfc822.Message(fp)
  
  class Maildir:
  
!         # Qmail directory mailbox
  
!         def __init__(self, dirname):
!                 import string
!                 self.dirname = dirname
!                 self.boxes = []
! 
!                 # check for new mail
!                 newdir = os.path.join(self.dirname, 'new')
!                 for file in os.listdir(newdir):
!                         if len(string.split(file, '.')) > 2:
!                                 self.boxes.append(os.path.join(newdir, file))
! 
!                 # Now check for current mail in this maildir
!                 curdir = os.path.join(self.dirname, 'cur')
!                 for file in os.listdir(curdir):
!                         if len(string.split(file, '.')) > 2:
!                                 self.boxes.append(os.path.join(curdir, file))
! 
!         def next(self):
!                 if not self.boxes:
!                         return None
!                 fn = self.boxes[0]
!                 del self.boxes[0]
!                 fp = open(os.path.join(self.dirname, fn))
!                 return rfc822.Message(fp)
  
  class BabylMailbox(_Mailbox):
  
!         def _search_start(self):
!                 while 1:
!                         line = self.fp.readline()
!                         if not line:
!                                 raise EOFError
!                         if line == '*** EOOH ***\n':
!                                 return
! 
!         def _search_end(self):
!                 while 1:
!                         pos = self.fp.tell()
!                         line = self.fp.readline()
!                         if not line:
!                                 return
!                         if line == '\037\014\n':
!                                 self.fp.seek(pos)
!                                 return
  
  
  def _test():
!         import time
!         import sys
!         import string
!         import os
! 
!         args = sys.argv[1:]
!         if not args:
!                 for key in 'MAILDIR', 'MAIL', 'LOGNAME', 'USER':
!                         if os.environ.has_key(key):
!                                 mbox = os.environ[key]
!                                 break
!                 else:
!                         print "$MAIL, $LOGNAME nor $USER set -- who are you?"
!                         return
!         else:
!                 mbox = args[0]
!         if mbox[:1] == '+':
!                 mbox = os.environ['HOME'] + '/Mail/' + mbox[1:]
!         elif not '/' in mbox:
!                 mbox = '/usr/mail/' + mbox
!         if os.path.isdir(mbox):
!                 if os.path.isdir(os.path.join(mbox, 'cur')):
!                         mb = Maildir(mbox)
!                 else:
!                         mb = MHMailbox(mbox)
!         else:
!                 fp = open(mbox, 'r')
!                 mb = UnixMailbox(fp)
!         
!         msgs = []
!         while 1:
!                 msg = mb.next()
!                 if msg is None:
!                         break
!                 msgs.append(msg)
!                 if len(args) <= 1:
!                         msg.fp = None
!         if len(args) > 1:
!                 num = string.atoi(args[1])
!                 print 'Message %d body:'%num
!                 msg = msgs[num-1]
!                 msg.rewindbody()
!                 sys.stdout.write(msg.fp.read())
!         else:
!                 print 'Mailbox',mbox,'has',len(msgs),'messages:'
!                 for msg in msgs:
!                         f = msg.getheader('from') or ""
!                         s = msg.getheader('subject') or ""
!                         d = msg.getheader('date') or ""
!                         print '%20.20s   %18.18s   %-30.30s'%(f, d[5:], s)
  
  
  if __name__ == '__main__':
!         _test()

Index: mimetypes.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mimetypes.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** mimetypes.py	1999/05/20 12:52:04	1.10
--- mimetypes.py	2000/02/10 17:17:13	1.11
***************
*** 31,36 ****
      "/usr/local/etc/httpd/conf/mime.types",
      "/usr/local/lib/netscape/mime.types",
!     "/usr/local/etc/httpd/conf/mime.types",	# Apache 1.2
!     "/usr/local/etc/mime.types",		# Apache 1.3
      ]
  
--- 31,36 ----
      "/usr/local/etc/httpd/conf/mime.types",
      "/usr/local/lib/netscape/mime.types",
!     "/usr/local/etc/httpd/conf/mime.types",     # Apache 1.2
!     "/usr/local/etc/mime.types",                # Apache 1.3
      ]
  
***************
*** 57,78 ****
      scheme, url = urllib.splittype(url)
      if scheme == 'data':
! 	# syntax of data URLs:
! 	# dataurl   := "data:" [ mediatype ] [ ";base64" ] "," data
! 	# mediatype := [ type "/" subtype ] *( ";" parameter )
! 	# data      := *urlchar
! 	# parameter := attribute "=" value
! 	# type/subtype defaults to "text/plain"
! 	comma = string.find(url, ',')
! 	if comma < 0:
! 	    # bad data URL
! 	    return None, None
! 	semi = string.find(url, ';', 0, comma)
! 	if semi >= 0:
! 	    type = url[:semi]
! 	else:
! 	    type = url[:comma]
! 	if '=' in type or '/' not in type:
! 	    type = 'text/plain'
! 	return type, None		# never compressed, so encoding is None
      base, ext = posixpath.splitext(url)
      while suffix_map.has_key(ext):
--- 57,78 ----
      scheme, url = urllib.splittype(url)
      if scheme == 'data':
!         # syntax of data URLs:
!         # dataurl   := "data:" [ mediatype ] [ ";base64" ] "," data
!         # mediatype := [ type "/" subtype ] *( ";" parameter )
!         # data      := *urlchar
!         # parameter := attribute "=" value
!         # type/subtype defaults to "text/plain"
!         comma = string.find(url, ',')
!         if comma < 0:
!             # bad data URL
!             return None, None
!         semi = string.find(url, ';', 0, comma)
!         if semi >= 0:
!             type = url[:semi]
!         else:
!             type = url[:comma]
!         if '=' in type or '/' not in type:
!             type = 'text/plain'
!         return type, None               # never compressed, so encoding is None
      base, ext = posixpath.splitext(url)
      while suffix_map.has_key(ext):

Index: rfc822.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/rfc822.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** rfc822.py	2000/01/17 14:11:04	1.45
--- rfc822.py	2000/02/10 17:17:14	1.46
***************
*** 333,341 ****
          raw = []
          for h in self.getallmatchingheaders(name):
! 	    if h[0] in ' \t':
! 	        raw.append(h)
! 	    else:
! 	        if raw:
! 		    raw.append(', ')
                  i = string.find(h, ':')
                  if i > 0:
--- 333,341 ----
          raw = []
          for h in self.getallmatchingheaders(name):
!             if h[0] in ' \t':
!                 raw.append(h)
!             else:
!                 if raw:
!                     raw.append(', ')
                  i = string.find(h, ':')
                  if i > 0:
***************
*** 787,791 ****
  _monthnames = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul',
                 'aug', 'sep', 'oct', 'nov', 'dec',
! 	       'january', 'february', 'march', 'april', 'may', 'june', 'july',
                 'august', 'september', 'october', 'november', 'december']
  _daynames = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
--- 787,791 ----
  _monthnames = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul',
                 'aug', 'sep', 'oct', 'nov', 'dec',
!                'january', 'february', 'march', 'april', 'may', 'june', 'july',
                 'august', 'september', 'october', 'november', 'december']
  _daynames = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
***************
*** 838,851 ****
      if mm > 12: mm = mm - 12
      if dd[-1] == ',':
! 	dd = dd[:-1]
      i = string.find(yy, ':')
      if i > 0:
! 	yy, tm = tm, yy
      if yy[-1] == ',':
! 	yy = yy[:-1]
      if yy[0] not in string.digits:
! 	yy, tz = tz, yy
      if tm[-1] == ',':
! 	tm = tm[:-1]
      tm = string.splitfields(tm, ':')
      if len(tm) == 2:
--- 838,851 ----
      if mm > 12: mm = mm - 12
      if dd[-1] == ',':
!         dd = dd[:-1]
      i = string.find(yy, ':')
      if i > 0:
!         yy, tm = tm, yy
      if yy[-1] == ',':
!         yy = yy[:-1]
      if yy[0] not in string.digits:
!         yy, tz = tz, yy
      if tm[-1] == ',':
!         tm = tm[:-1]
      tm = string.splitfields(tm, ':')
      if len(tm) == 2:

Index: shelve.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/shelve.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** shelve.py	1999/08/11 01:54:05	1.12
--- shelve.py	2000/02/10 17:17:14	1.13
***************
*** 11,27 ****
  object):
  
! 	import shelve
! 	d = shelve.open(filename) # open, with (g)dbm filename -- no suffix
  
! 	d[key] = data	# store data at key (overwrites old data if
! 			# using an existing key)
! 	data = d[key]	# retrieve data at key (raise KeyError if no
! 			# such key)
! 	del d[key]	# delete data stored at key (raises KeyError
! 			# if no such key)
! 	flag = d.has_key(key)	# true if the key exists
! 	list = d.keys()	# a list of all existing keys (slow!)
  
! 	d.close()	# close it
  
  Dependent on the implementation, closing a persistent dictionary may
--- 11,27 ----
  object):
  
!         import shelve
!         d = shelve.open(filename) # open, with (g)dbm filename -- no suffix
  
!         d[key] = data   # store data at key (overwrites old data if
!                         # using an existing key)
!         data = d[key]   # retrieve data at key (raise KeyError if no
!                         # such key)
!         del d[key]      # delete data stored at key (raises KeyError
!                         # if no such key)
!         flag = d.has_key(key)   # true if the key exists
!         list = d.keys() # a list of all existing keys (slow!)
  
!         d.close()       # close it
  
  Dependent on the implementation, closing a persistent dictionary may
***************
*** 32,157 ****
  
  try:
! 	from cPickle import Pickler, Unpickler
  except ImportError:
! 	from pickle import Pickler, Unpickler
  
  try:
! 	from cStringIO import StringIO
  except ImportError:
! 	from StringIO import StringIO
  
  
  class Shelf:
! 	"""Base class for shelf implementations.
  
! 	This is initialized with a dictionary-like object.
! 	See the module's __doc__ string for an overview of the interface.
! 	"""
! 
! 	def __init__(self, dict):
! 		self.dict = dict
! 	
! 	def keys(self):
! 		return self.dict.keys()
! 	
! 	def __len__(self):
! 		return len(self.dict)
! 	
! 	def has_key(self, key):
! 		return self.dict.has_key(key)
! 
! 	def get(self, key, default=None):
! 	        if self.dict.has_key(key):
! 			return self[key]
! 		return default
! 	
! 	def __getitem__(self, key):
! 		f = StringIO(self.dict[key])
! 		return Unpickler(f).load()
! 	
! 	def __setitem__(self, key, value):
! 		f = StringIO()
! 		p = Pickler(f)
! 		p.dump(value)
! 		self.dict[key] = f.getvalue()
! 	
! 	def __delitem__(self, key):
! 		del self.dict[key]
! 	
! 	def close(self):
! 		try:
! 			self.dict.close()
! 		except:
! 			pass
! 		self.dict = 0
! 
! 	def __del__(self):
! 		self.close()
! 
! 	def sync(self):
! 		if hasattr(self.dict, 'sync'):
! 			self.dict.sync()
! 	    
  
  class BsdDbShelf(Shelf):
! 	"""Shelf implementation using the "BSD" db interface.
  
! 	This adds methods first(), next(), previous(), last() and
! 	set_location() that have no counterpart in [g]dbm databases.
  
! 	The actual database must be opened using one of the "bsddb"
! 	modules "open" routines (i.e. bsddb.hashopen, bsddb.btopen or
! 	bsddb.rnopen) and passed to the constructor.
! 
! 	See the module's __doc__ string for an overview of the interface.
! 	"""
! 
! 	def __init__(self, dict):
! 	    Shelf.__init__(self, dict)
! 
! 	def set_location(self, key):
! 	     (key, value) = self.dict.set_location(key)
! 	     f = StringIO(value)
! 	     return (key, Unpickler(f).load())
! 
! 	def next(self):
! 	     (key, value) = self.dict.next()
! 	     f = StringIO(value)
! 	     return (key, Unpickler(f).load())
! 
! 	def previous(self):
! 	     (key, value) = self.dict.previous()
! 	     f = StringIO(value)
! 	     return (key, Unpickler(f).load())
! 
! 	def first(self):
! 	     (key, value) = self.dict.first()
! 	     f = StringIO(value)
! 	     return (key, Unpickler(f).load())
! 
! 	def last(self):
! 	     (key, value) = self.dict.last()
! 	     f = StringIO(value)
! 	     return (key, Unpickler(f).load())
  
  
  class DbfilenameShelf(Shelf):
! 	"""Shelf implementation using the "anydbm" generic dbm interface.
  
! 	This is initialized with the filename for the dbm database.
! 	See the module's __doc__ string for an overview of the interface.
! 	"""
! 	
! 	def __init__(self, filename, flag='c'):
! 		import anydbm
! 		Shelf.__init__(self, anydbm.open(filename, flag))
  
  
  def open(filename, flag='c'):
! 	"""Open a persistent dictionary for reading and writing.
  
! 	Argument is the filename for the dbm database.
! 	See the module's __doc__ string for an overview of the interface.
! 	"""
! 	
! 	return DbfilenameShelf(filename, flag)
--- 32,157 ----
  
  try:
!         from cPickle import Pickler, Unpickler
  except ImportError:
!         from pickle import Pickler, Unpickler
  
  try:
!         from cStringIO import StringIO
  except ImportError:
!         from StringIO import StringIO
  
  
  class Shelf:
!         """Base class for shelf implementations.
  
!         This is initialized with a dictionary-like object.
!         See the module's __doc__ string for an overview of the interface.
!         """
! 
!         def __init__(self, dict):
!                 self.dict = dict
!         
!         def keys(self):
!                 return self.dict.keys()
!         
!         def __len__(self):
!                 return len(self.dict)
!         
!         def has_key(self, key):
!                 return self.dict.has_key(key)
! 
!         def get(self, key, default=None):
!                 if self.dict.has_key(key):
!                         return self[key]
!                 return default
!         
!         def __getitem__(self, key):
!                 f = StringIO(self.dict[key])
!                 return Unpickler(f).load()
!         
!         def __setitem__(self, key, value):
!                 f = StringIO()
!                 p = Pickler(f)
!                 p.dump(value)
!                 self.dict[key] = f.getvalue()
!         
!         def __delitem__(self, key):
!                 del self.dict[key]
!         
!         def close(self):
!                 try:
!                         self.dict.close()
!                 except:
!                         pass
!                 self.dict = 0
! 
!         def __del__(self):
!                 self.close()
! 
!         def sync(self):
!                 if hasattr(self.dict, 'sync'):
!                         self.dict.sync()
!             
  
  class BsdDbShelf(Shelf):
!         """Shelf implementation using the "BSD" db interface.
  
!         This adds methods first(), next(), previous(), last() and
!         set_location() that have no counterpart in [g]dbm databases.
  
!         The actual database must be opened using one of the "bsddb"
!         modules "open" routines (i.e. bsddb.hashopen, bsddb.btopen or
!         bsddb.rnopen) and passed to the constructor.
! 
!         See the module's __doc__ string for an overview of the interface.
!         """
! 
!         def __init__(self, dict):
!             Shelf.__init__(self, dict)
! 
!         def set_location(self, key):
!              (key, value) = self.dict.set_location(key)
!              f = StringIO(value)
!              return (key, Unpickler(f).load())
! 
!         def next(self):
!              (key, value) = self.dict.next()
!              f = StringIO(value)
!              return (key, Unpickler(f).load())
! 
!         def previous(self):
!              (key, value) = self.dict.previous()
!              f = StringIO(value)
!              return (key, Unpickler(f).load())
! 
!         def first(self):
!              (key, value) = self.dict.first()
!              f = StringIO(value)
!              return (key, Unpickler(f).load())
! 
!         def last(self):
!              (key, value) = self.dict.last()
!              f = StringIO(value)
!              return (key, Unpickler(f).load())
  
  
  class DbfilenameShelf(Shelf):
!         """Shelf implementation using the "anydbm" generic dbm interface.
  
!         This is initialized with the filename for the dbm database.
!         See the module's __doc__ string for an overview of the interface.
!         """
!         
!         def __init__(self, filename, flag='c'):
!                 import anydbm
!                 Shelf.__init__(self, anydbm.open(filename, flag))
  
  
  def open(filename, flag='c'):
!         """Open a persistent dictionary for reading and writing.
  
!         Argument is the filename for the dbm database.
!         See the module's __doc__ string for an overview of the interface.
!         """
!         
!         return DbfilenameShelf(filename, flag)

Index: stringold.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/stringold.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** stringold.py	1999/10/12 19:54:40	1.43
--- stringold.py	2000/02/10 17:17:14	1.44
***************
*** 200,207 ****
      """
      if type(s) == _StringType:
! 	return _float(s)
      else:
! 	raise TypeError('argument 1: expected string, %s found' %
! 			type(s).__name__)
  
  # Convert string to integer
--- 200,207 ----
      """
      if type(s) == _StringType:
!         return _float(s)
      else:
!         raise TypeError('argument 1: expected string, %s found' %
!                         type(s).__name__)
  
  # Convert string to integer
***************
*** 218,233 ****
      """
      try:
! 	s = args[0]
      except IndexError:
! 	raise TypeError('function requires at least 1 argument: %d given' %
! 			len(args))
      # Don't catch type error resulting from too many arguments to int().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
! 	return _apply(_int, args)
      else:
! 	raise TypeError('argument 1: expected string, %s found' %
! 			type(s).__name__)
  
  
--- 218,233 ----
      """
      try:
!         s = args[0]
      except IndexError:
!         raise TypeError('function requires at least 1 argument: %d given' %
!                         len(args))
      # Don't catch type error resulting from too many arguments to int().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
!         return _apply(_int, args)
      else:
!         raise TypeError('argument 1: expected string, %s found' %
!                         type(s).__name__)
  
  
***************
*** 246,261 ****
      """
      try:
! 	s = args[0]
      except IndexError:
! 	raise TypeError('function requires at least 1 argument: %d given' %
! 			len(args))
      # Don't catch type error resulting from too many arguments to long().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
! 	return _apply(_long, args)
      else:
! 	raise TypeError('argument 1: expected string, %s found' %
! 			type(s).__name__)
  
  
--- 246,261 ----
      """
      try:
!         s = args[0]
      except IndexError:
!         raise TypeError('function requires at least 1 argument: %d given' %
!                         len(args))
      # Don't catch type error resulting from too many arguments to long().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
!         return _apply(_long, args)
      else:
!         raise TypeError('argument 1: expected string, %s found' %
!                         type(s).__name__)
  
  
***************
*** 299,304 ****
      half = n/2
      if n%2 and width%2:
! 	# This ensures that center(center(s, i), j) = center(s, j)
! 	half = half+1
      return ' '*half +  s + ' '*(n-half)
  
--- 299,304 ----
      half = n/2
      if n%2 and width%2:
!         # This ensures that center(center(s, i), j) = center(s, j)
!         half = half+1
      return ' '*half +  s + ' '*(n-half)
  
***************
*** 319,323 ****
      sign = ''
      if s[0] in ('-', '+'):
! 	sign, s = s[0], s[1:]
      return sign + '0'*(width-n) + s
  
--- 319,323 ----
      sign = ''
      if s[0] in ('-', '+'):
!         sign, s = s[0], s[1:]
      return sign + '0'*(width-n) + s
  
***************
*** 334,343 ****
      res = line = ''
      for c in s:
! 	if c == '\t':
! 	    c = ' '*(tabsize - len(line) % tabsize)
! 	line = line + c
! 	if c == '\n':
! 	    res = res + line
! 	    line = ''
      return res + line
  
--- 334,343 ----
      res = line = ''
      for c in s:
!         if c == '\t':
!             c = ' '*(tabsize - len(line) % tabsize)
!         line = line + c
!         if c == '\n':
!             res = res + line
!             line = ''
      return res + line
  
***************
*** 388,399 ****
      """
      if len(fromstr) != len(tostr):
! 	raise ValueError, "maketrans arguments must have same length"
      global _idmapL
      if not _idmapL:
! 	_idmapL = map(None, _idmap)
      L = _idmapL[:]
      fromstr = map(ord, fromstr)
      for i in range(len(fromstr)):
! 	L[fromstr[i]] = tostr[i]
      return joinfields(L, "")
  
--- 388,399 ----
      """
      if len(fromstr) != len(tostr):
!         raise ValueError, "maketrans arguments must have same length"
      global _idmapL
      if not _idmapL:
!         _idmapL = map(None, _idmap)
      L = _idmapL[:]
      fromstr = map(ord, fromstr)
      for i in range(len(fromstr)):
!         L[fromstr[i]] = tostr[i]
      return joinfields(L, "")
  
***************
*** 429,431 ****
      letters = lowercase + uppercase
  except ImportError:
!     pass					  # Use the original versions
--- 429,431 ----
      letters = lowercase + uppercase
  except ImportError:
!     pass                                          # Use the original versions

Index: urllib2.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/urllib2.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** urllib2.py	2000/02/04 15:28:42	1.2
--- urllib2.py	2000/02/10 17:17:14	1.3
***************
*** 149,156 ****
      # the implementation.  need to override __init__ and __str__
      def __init__(self, reason):
! 	self.reason = reason
  
      def __str__(self):
! 	return '<urlopen error %s>' % self.reason
  
  class HTTPError(URLError, addinfourl):
--- 149,156 ----
      # the implementation.  need to override __init__ and __str__
[...1256 lines suppressed...]
!             return 1
      p = CustomProxy('http', at_cnri, 'proxy.cnri.reston.va.us')
      ph = CustomProxyHandler(p)
***************
*** 1053,1059 ****
              f = urlopen(url, req)
          except IOError, err:
! 	    print "IOError:", err
! 	except socket.error, err:
! 	    print "socket.error:", err
          else:
              buf = f.read()
--- 1053,1059 ----
              f = urlopen(url, req)
          except IOError, err:
!             print "IOError:", err
!         except socket.error, err:
!             print "socket.error:", err
          else:
              buf = f.read()

Index: whichdb.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/whichdb.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** whichdb.py	1999/06/08 13:13:16	1.5
--- whichdb.py	2000/02/10 17:17:14	1.6
***************
*** 57,61 ****
      # BSD hash v2 has a 12-byte NULL pad in front of the file type
      try:
! 	(magic,) = struct.unpack("=l", s16[-4:])
      except struct.error:
          return ""
--- 57,61 ----
      # BSD hash v2 has a 12-byte NULL pad in front of the file type
      try:
!         (magic,) = struct.unpack("=l", s16[-4:])
      except struct.error:
          return ""



From fdrake@weyr.cnri.reston.va.us  Thu Feb 10 17:23:46 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 10 Feb 2000 12:23:46 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src Makefile.in,1.81,1.82
Message-ID: <200002101723.MAA06689@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src
In directory weyr:/home/fdrake/projects/python

Modified Files:
	Makefile.in 
Log Message:

Enable -t when compiling Python library modules in libinstall (.pyc
version only).

Enable -tt for the regression test.

Very similar to Skip's patch.


Index: Makefile.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Makefile.in,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** Makefile.in	1999/11/16 15:58:32	1.81
--- Makefile.in	2000/02/10 17:23:44	1.82
***************
*** 235,239 ****
  TESTOPTS=	
  TESTPROG=	$(srcdir)/Lib/test/regrtest.py
! TESTPYTHON=	./python$(EXE)
  test:		all
  		-rm -f $(srcdir)/Lib/test/*.py[co]
--- 235,239 ----
  TESTOPTS=	
  TESTPROG=	$(srcdir)/Lib/test/regrtest.py
! TESTPYTHON=	./python$(EXE) -tt
  test:		all
  		-rm -f $(srcdir)/Lib/test/*.py[co]
***************
*** 347,351 ****
  		done
  		PYTHONPATH=$(LIBDEST) \
! 			./python$(EXE) $(LIBDEST)/compileall.py $(LIBDEST)
  		PYTHONPATH=$(LIBDEST) \
  			./python$(EXE) -O $(LIBDEST)/compileall.py $(LIBDEST)
--- 347,351 ----
  		done
  		PYTHONPATH=$(LIBDEST) \
! 			./python$(EXE) -t $(LIBDEST)/compileall.py $(LIBDEST)
  		PYTHONPATH=$(LIBDEST) \
  			./python$(EXE) -O $(LIBDEST)/compileall.py $(LIBDEST)



From bwarsaw@cnri.reston.va.us  Thu Feb 10 20:25:56 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw)
Date: Thu, 10 Feb 2000 15:25:56 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib nntplib.py,1.17,1.18
Message-ID: <200002102025.PAA01706@anthem.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory anthem:/home/bwarsaw/projects/python/Lib

Modified Files:
	nntplib.py 
Log Message:
Added new exception classes:

    NNTPError - derived from Exception, it's the base class for all
    other exceptions in this module

    NNTPReplyError - what used to be error_reply

    NNTPTemporaryError - what used to be error_temp

    NNTPPermanentError - what used to be error_perm

    NNTPProtocolError - what used to be error_proto

    NNTPDataError - what used to be error_data

All the old names are retained for backwards compatibility; they point
to the class that replaces them.  Also, any code in this module that
raises an exception, now does so with the exception class.

NNTP.__init__(): Added a new optional argument `readermode', which is
a flag that defaults to false.  When set to true, the "mode reader"
command is sent to the NNTP server before user authentication.  Reader
mode is sometimes necessary if you are connecting to an NNTP server on
the local machine and intend to call reader-specific comamnds, such as
`group'.  If you get unexpected NNTPPermanentErrors, you might need to
set readermode.  Patch provided by Thomas Wouters (who include the
standard disclaimer on is patches@python.org submission), and inspired
by Jim Tittsler.


Index: nntplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/nntplib.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** nntplib.py	2000/02/04 15:10:33	1.17
--- nntplib.py	2000/02/10 20:25:53	1.18
***************
*** 35,46 ****
  
  
! # Exception raised when an error or invalid response is received
! error_reply = 'nntplib.error_reply'	# unexpected [123]xx reply
! error_temp = 'nntplib.error_temp'	# 4xx errors
! error_perm = 'nntplib.error_perm'	# 5xx errors
! error_proto = 'nntplib.error_proto'	# response does not begin with [1-5]
! error_data = 'nntplib.error_data'	# error in response data
  
  
  # Standard port used by NNTP servers
  NNTP_PORT = 119
--- 35,78 ----
  
  
! 
! # Exceptions raised when an error or invalid response is received
! class NNTPError(Exception):
! 	"""Base class for all nntplib exceptions"""
! 	def __init__(self, *args):
! 		apply(Exception.__init__, (self,)+args)
! 		try:
! 			self.response = args[0]
! 		except IndexError:
! 			self.response = 'No response given'
! 
! class NNTPReplyError(NNTPError):
! 	"""Unexpected [123]xx reply"""
! 	pass
! 
! class NNTPTemporaryError(NNTPError):
! 	"""4xx errors"""
! 	pass
! 
! class NNTPPermanentError(NNTPError):
! 	"""5xx errors"""
! 	pass
! 
! class NNTPProtocolError(NNTPError):
! 	"""Response does not begin with [1-5]"""
! 	pass
! 
! class NNTPDataError(NNTPError):
! 	"""Error in response data"""
! 	pass
! 
! # for backwards compatibility
! error_reply = NNTPReplyError
! error_temp = NNTPTemporaryError
! error_perm = NNTPPermanentError
! error_proto = NNTPProtocolError
! error_data = NNTPDataError
  
  
+ 
  # Standard port used by NNTP servers
  NNTP_PORT = 119
***************
*** 55,67 ****
  
  
  # The class itself
- 
  class NNTP:
! 
! 	def __init__(self, host, port = NNTP_PORT, user=None, password=None):
  		"""Initialize an instance.  Arguments:
  		- host: hostname to connect to
! 		- port: port to connect to (default the standard NNTP port)"""
! 
  		self.host = host
  		self.port = port
--- 87,109 ----
  
  
+ 
  # The class itself
  class NNTP:
! 	def __init__(self, host, port=NNTP_PORT, user=None, password=None,
! 		     readermode=None):
  		"""Initialize an instance.  Arguments:
  		- host: hostname to connect to
! 		- port: port to connect to (default the standard NNTP port)
! 		- user: username to authenticate with
! 		- password: password to use with username
! 		- readermode: if true, send 'mode reader' command after
! 		              connecting.
! 
! 	        readermode is sometimes necessary if you are connecting to an
! 	        NNTP server on the local machine and intend to call
! 	        reader-specific comamnds, such as `group'.  If you get
! 	        unexpected NNTPPermanentErrors, you might need to set
! 	        readermode.
! 		"""
  		self.host = host
  		self.port = port
***************
*** 71,84 ****
  		self.debugging = 0
  		self.welcome = self.getresp()
  		if user:
  			resp = self.shortcmd('authinfo user '+user)
  			if resp[:3] == '381':
  				if not password:
! 					raise error_reply, resp
  				else:
  					resp = self.shortcmd(
  						'authinfo pass '+password)
  					if resp[:3] != '281':
! 						raise error_perm, resp
  
  	def getwelcome(self):
--- 113,137 ----
  		self.debugging = 0
  		self.welcome = self.getresp()
+ 		if readermode:
+ 			try:
+ 				self.welcome = self.shortcmd('mode reader')
+ 			except NNTPPermanentError:
+ 				# error 500, probably 'not implemented'
+ 				pass
  		if user:
  			resp = self.shortcmd('authinfo user '+user)
  			if resp[:3] == '381':
  				if not password:
! 					raise NNTPReplyError(resp)
  				else:
  					resp = self.shortcmd(
  						'authinfo pass '+password)
  					if resp[:3] != '281':
! 						raise NNTPPermanentError(resp)
! 
! 	# Get the welcome message from the server
! 	# (this is read and squirreled away by __init__()).
! 	# If the response code is 200, posting is allowed;
! 	# if it 201, posting is not allowed
  
  	def getwelcome(self):
***************
*** 129,137 ****
  		c = resp[:1]
  		if c == '4':
! 			raise error_temp, resp
  		if c == '5':
! 			raise error_perm, resp
  		if c not in '123':
! 			raise error_proto, resp
  		return resp
  
--- 182,190 ----
  		c = resp[:1]
  		if c == '4':
! 			raise NNTPTemporaryError(resp)
  		if c == '5':
! 			raise NNTPPermanentError(resp)
  		if c not in '123':
! 			raise NNTPProtocolError(resp)
  		return resp
  
***************
*** 141,145 ****
  		resp = self.getresp()
  		if resp[:3] not in LONGRESP:
! 			raise error_reply, resp
  		list = []
  		while 1:
--- 194,198 ----
  		resp = self.getresp()
  		if resp[:3] not in LONGRESP:
! 			raise NNTPReplyError(resp)
  		list = []
  		while 1:
***************
*** 207,211 ****
  		resp = self.shortcmd('GROUP ' + name)
  		if resp[:3] <> '211':
! 			raise error_reply, resp
  		words = string.split(resp)
  		count = first = last = 0
--- 260,264 ----
  		resp = self.shortcmd('GROUP ' + name)
  		if resp[:3] <> '211':
! 			raise NNTPReplyError(resp)
  		words = string.split(resp)
  		count = first = last = 0
***************
*** 231,235 ****
  		"""Internal: parse the response of a STAT, NEXT or LAST command."""
  		if resp[:2] <> '22':
! 			raise error_reply, resp
  		words = string.split(resp)
  		nr = 0
--- 284,288 ----
  		"""Internal: parse the response of a STAT, NEXT or LAST command."""
  		if resp[:2] <> '22':
! 			raise NNTPReplyError(resp)
  		words = string.split(resp)
  		nr = 0
***************
*** 350,354 ****
  						    elem[7]))
  			except IndexError:
! 				raise error_data,line
  		return resp,xover_lines
  
--- 403,407 ----
  						    elem[7]))
  			except IndexError:
! 				raise NNTPDataError(line)
  		return resp,xover_lines
  
***************
*** 378,386 ****
  		resp = self.shortcmd("XPATH " + id)
  		if resp[:3] <> '223':
! 			raise error_reply, resp
  		try:
  			[resp_num, path] = string.split(resp)
  		except ValueError:
! 			raise error_reply, resp
  		else:
  			return resp, path
--- 431,439 ----
  		resp = self.shortcmd("XPATH " + id)
  		if resp[:3] <> '223':
! 			raise NNTPReplyError(resp)
  		try:
  			[resp_num, path] = string.split(resp)
  		except ValueError:
! 			raise NNTPReplyError(resp)
  		else:
  			return resp, path
***************
*** 396,407 ****
  		resp = self.shortcmd("DATE")
  		if resp[:3] <> '111':
! 			raise error_reply, resp
  		elem = string.split(resp)
  		if len(elem) != 2:
! 			raise error_data, resp
  		date = elem[1][2:8]
  		time = elem[1][-6:]
  		if len(date) != 6 or len(time) != 6:
! 			raise error_data, resp
  		return resp, date, time
  
--- 449,460 ----
  		resp = self.shortcmd("DATE")
  		if resp[:3] <> '111':
! 			raise NNTPReplyError(resp)
  		elem = string.split(resp)
  		if len(elem) != 2:
! 			raise NNTPDataError(resp)
  		date = elem[1][2:8]
  		time = elem[1][-6:]
  		if len(date) != 6 or len(time) != 6:
! 			raise NNTPDataError(resp)
  		return resp, date, time
  
***************
*** 416,420 ****
  		# Raises error_??? if posting is not allowed
  		if resp[0] <> '3':
! 			raise error_reply, resp
  		while 1:
  			line = f.readline()
--- 469,473 ----
  		# Raises error_??? if posting is not allowed
  		if resp[0] <> '3':
! 			raise NNTPReplyError(resp)
  		while 1:
  			line = f.readline()
***************
*** 440,444 ****
  		# Raises error_??? if the server already has it
  		if resp[0] <> '3':
! 			raise error_reply, resp
  		while 1:
  			line = f.readline()
--- 493,497 ----
  		# Raises error_??? if the server already has it
  		if resp[0] <> '3':
! 			raise NNTPReplyError(resp)
  		while 1:
  			line = f.readline()
***************
*** 466,470 ****
  def _test():
  	"""Minimal test function."""
! 	s = NNTP('news')
  	resp, count, first, last, name = s.group('comp.lang.python')
  	print resp
--- 519,523 ----
  def _test():
  	"""Minimal test function."""
! 	s = NNTP('news', readermode='reader')
  	resp, count, first, last, name = s.group('comp.lang.python')
  	print resp



From bwarsaw@cnri.reston.va.us  Thu Feb 10 20:26:47 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw)
Date: Thu, 10 Feb 2000 15:26:47 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libnntplib.tex,1.23,1.24
Message-ID: <200002102026.PAA01724@anthem.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory anthem:/home/bwarsaw/projects/python/Doc/lib

Modified Files:
	libnntplib.tex 
Log Message:
Document the API changes to the nntplib module (exceptions become
classes, NNTP.__init__() grows a new optional argument to set reader
mode on the server).


Index: libnntplib.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libnntplib.tex,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** libnntplib.tex	1999/04/22 16:45:26	1.23
--- libnntplib.tex	2000/02/10 20:26:45	1.24
***************
*** 54,58 ****
  
  \begin{classdesc}{NNTP}{host\optional{, port
!                         \optional{, user\optional{, password}}}}
  Return a new instance of the \class{NNTP} class, representing a
  connection to the NNTP server running on host \var{host}, listening at
--- 54,59 ----
  
  \begin{classdesc}{NNTP}{host\optional{, port
!                         \optional{, user\optional{, password
! 			\optional{, readermode}}}}}
  Return a new instance of the \class{NNTP} class, representing a
  connection to the NNTP server running on host \var{host}, listening at
***************
*** 60,82 ****
  \var{user} and \var{password} are provided, the
  \samp{AUTHINFO USER} and \samp{AUTHINFO PASS} commands are used to
! identify and authenticate the user to the server.
  \end{classdesc}
  
! \begin{excdesc}{error_reply}
! Exception raised when an unexpected reply is received from the server.
! \end{excdesc}
  
! \begin{excdesc}{error_temp}
! Exception raised when an error code in the range 400--499 is received.
! \end{excdesc}
  
! \begin{excdesc}{error_perm}
! Exception raised when an error code in the range 500--599 is received.
! \end{excdesc}
  
! \begin{excdesc}{error_proto}
  Exception raised when a reply is received from the server that does
! not begin with a digit in the range 1--5.
! \end{excdesc}
  
  
--- 61,108 ----
  \var{user} and \var{password} are provided, the
  \samp{AUTHINFO USER} and \samp{AUTHINFO PASS} commands are used to
! identify and authenticate the user to the server.  If the optional
! flag \var{readermode} is true, then a \samp{mode reader} command is
! sent before authentication is performed.  Reader mode is sometimes
! necessary if you are connecting to an NNTP server on the local machine
! and intend to call reader-specific commands, such as \samp{group}.  If
! you get unexpected \code{NNTPPermanentError}s, you might need to set
! \var{readermode}.  \var{readermode} defaults to \code{None}.
  \end{classdesc}
  
! \begin{classdesc}{NNTPError}{}
! Derived from the standard exception \code{Exception}, this is the base
! class for all exceptions raised by the \code{nntplib} module.
! \end{classdesc}
! 
! \begin{classdesc}{NNTPReplyError}{}
! Exception raised when an unexpected reply is received from the
! server.  For backwards compatibility, the exception \code{error_reply}
! is equivalent to this class.
! \end{classdesc}
  
! \begin{classdesc}{NNTPTemporaryError}{}
! Exception raised when an error code in the range 400--499 is
! received.  For backwards compatibility, the exception
! \code{error_temp} is equivalent to this class.
! \end{classdesc}
  
! \begin{classdesc}{NNTPPermanentError}{}
! Exception raised when an error code in the range 500--599 is
! received.  For backwards compatibility, the exception
! \code{error_perm} is equivalent to this class.
! \end{classdesc}
  
! \begin{classdesc}{NNTPProtocolError}{}
  Exception raised when a reply is received from the server that does
! not begin with a digit in the range 1--5.  For backwards
! compatibility, the exception \code{error_proto} is equivalent to this
! class.
! \end{classdesc}
! 
! \begin{classdesc}{NNTPDataError}{}
! Exception raised when there is some error in the response data.  For
! backwards compatibility, the exception \code{error_data} is
! equivalent to this class.
! \end{classdesc}
  
  



From a.eyre@optichrome.com  Fri Feb 11 11:32:44 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Fri, 11 Feb 2000 11:32:44 -0000
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <200002101621.LAA00758@weyr.cnri.reston.va.us>
Message-ID: <000a01bf7483$b6943fd0$3acbd9c2@peridot.optichrome.com>

> Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47

Is this module not obsolete now, seeing as how the string methods have
been added to the string type?



From gstein@lyra.org  Fri Feb 11 11:46:45 2000
From: gstein@lyra.org (Greg Stein)
Date: Fri, 11 Feb 2000 03:46:45 -0800 (PST)
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <000a01bf7483$b6943fd0$3acbd9c2@peridot.optichrome.com>
Message-ID: <Pine.LNX.4.10.10002110344550.4541-100000@nebula.lyra.org>

On Fri, 11 Feb 2000, Adrian Eyre wrote:
> > Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
> 
> Is this module not obsolete now, seeing as how the string methods have
> been added to the string type?

Nope. There are other things in there, such as string.whitespace or
string.letters that aren't found elsewhere. There are also some functions
such as string.ljust or string.center that were not converted to methods.

Then, of course, we have the whole issue of people importing string in
half the modules in existence :-) ... lots of backwards-compat to worry
about.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/



From a.eyre@optichrome.com  Fri Feb 11 12:03:18 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Fri, 11 Feb 2000 12:03:18 -0000
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <Pine.LNX.4.10.10002110344550.4541-100000@nebula.lyra.org>
Message-ID: <000e01bf7487$fc205e90$3acbd9c2@peridot.optichrome.com>

> Nope. There are other things in there, such as string.whitespace or
> string.letters that aren't found elsewhere. There are also some functions
> such as string.ljust or string.center that were not converted to methods.

Another thing. Why has string.join been added to the string object, when
it make so much more sense to add it to the list object. i.e.:

<list>.join() -> <string>
>>> ["one", "two", "three"].join(" ")	# " " would be default arg
'one two three'

rather than:

<string>.join(<list>) -> <string>
>>> " ".join(["one", "two", "three"])
'one two three'

I can just see this: " ".join(xxxx) notation appearing all over the place.

-----------------------------------------------------------------
Adrian Eyre <a.eyre@optichrome.com> - http://www.optichrome.com 



From a.eyre@optichrome.com  Fri Feb 11 12:15:42 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Fri, 11 Feb 2000 12:15:42 -0000
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <000e01bf7487$fc205e90$3acbd9c2@peridot.optichrome.com>
Message-ID: <001101bf7489$b733f380$3acbd9c2@peridot.optichrome.com>

> Another thing. Why has string.join been added to the string object, when
> it make so much more sense to add it to the list object. i.e.:

Actually, s/list/sequence/

>>> ["a", "b", "c"].join()
'a b c'
>>> ("a", "b", "c").join()
'a b c'
>>> "abc".join(", ")
'a, b, c'

-----------------------------------------------------------------
Adrian Eyre <a.eyre@optichrome.com> - http://www.optichrome.com 



From fredrik@pythonware.com  Fri Feb 11 12:30:28 2000
From: fredrik@pythonware.com (Fredrik Lundh)
Date: Fri, 11 Feb 2000 13:30:28 +0100
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
References: <001101bf7489$b733f380$3acbd9c2@peridot.optichrome.com>
Message-ID: <006901bf748b$dd2e2bd0$f29b12c2@secret.pythonware.com>

> > Another thing. Why has string.join been added to the string object, =
when
> > it make so much more sense to add it to the list object. i.e.:
>=20
> Actually, s/list/sequence/

what sequence object?

(there are hundreds of them, but just
two basic string types...)

</F>



From a.eyre@optichrome.com  Fri Feb 11 15:59:13 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Fri, 11 Feb 2000 15:59:13 -0000
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <006901bf748b$dd2e2bd0$f29b12c2@secret.pythonware.com>
Message-ID: <001701bf74a8$f10ef400$3acbd9c2@peridot.optichrome.com>

> what sequence object?

By sequence object, I meant any Python object that returns true on
a PySequence_Check(), indicating it can be safely cast to a
PySequenceObject.

I figured that this applies to lists, tuples and strings. See
previous post for examples.

> (there are hundreds of them, but just two basic string types...)

Two? I'm confused now...

Unless you mean char/Unicode.

Besides, I don't see the connection...



From fredrik@pythonware.com  Fri Feb 11 16:55:59 2000
From: fredrik@pythonware.com (Fredrik Lundh)
Date: Fri, 11 Feb 2000 17:55:59 +0100
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
References: <001701bf74a8$f10ef400$3acbd9c2@peridot.optichrome.com>
Message-ID: <003001bf74b0$dfde09c0$f29b12c2@secret.pythonware.com>

> By sequence object, I meant any Python object that returns true on
> a PySequence_Check()

are we talking about the same language?

PySequence_Check checks if an object can be used as
a sequence.

> indicating it can be safely cast to a PySequenceObject.

there is no such thing as a PySequenceObject.

> I figured that this applies to lists, tuples and strings. See
> previous post for examples.

and even if it were, who would do the casting?

> > (there are hundreds of them, but just two basic string types...)
>=20
> Two? I'm confused now...

obviously ;-)

> Besides, I don't see the connection...

you will.  you will.

</F>



From a.eyre@optichrome.com  Fri Feb 11 17:32:53 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Fri, 11 Feb 2000 17:32:53 -0000
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <14500.17239.912973.801205@anthem.cnri.reston.va.us>
Message-ID: <000201bf74b6$06e9d1c0$3acbd9c2@peridot.optichrome.com>

>     AE> I figured that this applies to lists, tuples and strings. See
>     AE> previous post for examples.
> 
> And any class that acts like a sequence has to implement a join()
> method too.

If they want to override the default.

Assuming format:

<sequence>.join(separator = " ") -> <string>

The default would be something like:


PyObject* PySequence_Join(PyObject* self, PyObject* args)
{
	char* sep = " ";
	int len, idx;
	PyObject* str, result, pysep;

	assert(PySequence_Check(self)); /* not sure if this is needed */

	if (!PyArg_ParseTuple(args, "|s", &sep))
		return NULL;

	pysep = PyString_FromString(sep);
	result = PyString_New();

	len = PyObject_Length(self);
	for (idx = 0; idx < len; idx++)
	{
		str = PyObject_Str(PySequence_GetItem(self, idx));
		PyString_ConcatAndDel(result, str);
		if (idx != len)
			PyString_Concat(result, pysep);
	}

	Py_DECREF(pysep);

	return result;
}

So, providing their sequence implements getitem, and items can
be stringified, they won't need to override the default.

-----------------------------------------------------------------
Adrian Eyre <a.eyre@optichrome.com> - http://www.optichrome.com 



From bwarsaw@cnri.reston.va.us (Barry A. Warsaw)  Fri Feb 11 17:13:59 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw) (Barry A. Warsaw)
Date: Fri, 11 Feb 2000 12:13:59 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
References: <006901bf748b$dd2e2bd0$f29b12c2@secret.pythonware.com>
 <001701bf74a8$f10ef400$3acbd9c2@peridot.optichrome.com>
Message-ID: <14500.17239.912973.801205@anthem.cnri.reston.va.us>

>>>>> "AE" == Adrian Eyre <a.eyre@optichrome.com> writes:

    AE> By sequence object, I meant any Python object that returns
    AE> true on a PySequence_Check(), indicating it can be safely cast
    AE> to a PySequenceObject.

    AE> I figured that this applies to lists, tuples and strings. See
    AE> previous post for examples.

And any class that acts like a sequence has to implement a join()
method too.

-Barry


From Fredrik Lundh" <effbot@telia.com  Fri Feb 11 19:43:21 2000
From: Fredrik Lundh" <effbot@telia.com (Fredrik Lundh)
Date: Fri, 11 Feb 2000 20:43:21 +0100
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
References: <000201bf74b6$06e9d1c0$3acbd9c2@peridot.optichrome.com>
Message-ID: <02e501bf74c8$42fb2620$34aab5d4@hagrid>

Adrian Eyre <a.eyre@optichrome.com> wrote:
> >     AE> I figured that this applies to lists, tuples and strings. =
See
> >     AE> previous post for examples.
> >=20
> > And any class that acts like a sequence has to implement a join()
> > method too.
>=20
> If they want to override the default.

you're still confused.  "act like a sequence" is defined
by an interface, not a base class.  there is no default.

go study the sources, and you will understand.

</F>



From fdrake@weyr.cnri.reston.va.us  Fri Feb 11 19:38:05 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 11 Feb 2000 14:38:05 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/texinputs boilerplate.tex,1.37,1.37.2.1
Message-ID: <200002111938.OAA13822@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/texinputs
In directory weyr:/home/fdrake/projects/python/Doc-152p1/texinputs

Modified Files:
      Tag: release152p1-patches
	boilerplate.tex 
Log Message:

Per the consortium notes, Guido's address should be presented as
guido@python.org; drop the CNRI address.


Index: boilerplate.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/texinputs/boilerplate.tex,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -C2 -r1.37 -r1.37.2.1
*** boilerplate.tex	1999/07/02 15:27:14	1.37
--- boilerplate.tex	2000/02/11 19:38:02	1.37.2.1
***************
*** 4,10 ****
  	Corporation for National Research Initiatives (CNRI) \\
  	1895 Preston White Drive, Reston, Va 20191, USA \\
! 	E-mail: \email{guido@CNRI.Reston.Va.US}, \email{guido@python.org}
  }
  
! \date{July 6, 1999}			% XXX update before release!
  \release{1.5.2}
--- 4,10 ----
  	Corporation for National Research Initiatives (CNRI) \\
  	1895 Preston White Drive, Reston, Va 20191, USA \\
! 	E-mail: \email{guido@python.org}
  }
  
! \date{March 17, 2000}			% XXX update before release!
  \release{1.5.2}



From Gerrit <gerrit@nl.linux.org>  Fri Feb 11 20:43:05 2000
From: Gerrit <gerrit@nl.linux.org> (Gerrit Holl)
Date: Fri, 11 Feb 2000 21:43:05 +0100
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <02e501bf74c8$42fb2620$34aab5d4@hagrid>; from effbot@telia.com on Fri, Feb 11, 2000 at 08:43:21PM +0100
References: <000201bf74b6$06e9d1c0$3acbd9c2@peridot.optichrome.com> <02e501bf74c8$42fb2620$34aab5d4@hagrid>
Message-ID: <20000211214305.A7503@stopcontact.palga.uucp>

Hello,

Fredrik Lundh wrote on 950298201:
> Adrian Eyre <a.eyre@optichrome.com> wrote:
> > >     AE> I figured that this applies to lists, tuples and strings. See
> > >     AE> previous post for examples.
> > > 
> > > And any class that acts like a sequence has to implement a join()
> > > method too.
> > 
> > If they want to override the default.
> 
> you're still confused.  "act like a sequence" is defined
> by an interface, not a base class.  there is no default.
> 
> go study the sources, and you will understand.

Can you please discuss this somewhere else?
Either on python-dev, where I don't see it this obvious,
or on python-list, where I can contribute in the discussion.
I get frustated when I follow a discussion which I can't join!

I want to say that if types will eventually be classes in the Far Future,
a SequenceType could be implemented.

regards,
Gerrit.

-- 
Homepage: http://www.nl.linux.org/~gerrit
-----BEGIN GEEK CODE BLOCK----- http://www.geekcode.com
Version: 3.12
GCS dpu s-:-- a14 C++++>$ UL++ P--- L+++ E--- W++ N o? K? w--- !O
!M !V PS+ PE? Y? PGP-- t- 5? X? R- tv- b+(++) DI D+ G++ !e !r !y
-----END GEEK CODE BLOCK----- moc.edockeeg.www//:ptth


From Fredrik Lundh" <effbot@telia.com  Fri Feb 11 21:59:13 2000
From: Fredrik Lundh" <effbot@telia.com (Fredrik Lundh)
Date: Fri, 11 Feb 2000 22:59:13 +0100
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
References: <000201bf74b6$06e9d1c0$3acbd9c2@peridot.optichrome.com> <02e501bf74c8$42fb2620$34aab5d4@hagrid> <20000211214305.A7503@stopcontact.palga.uucp>
Message-ID: <005f01bf74db$3d51e3e0$34aab5d4@hagrid>

Gerrit Holl <gerrit.holl@pobox.com> wrote:
> Can you please discuss this somewhere else?
> Either on python-dev, where I don't see it this obvious,
> or on python-list, where I can contribute in the discussion.
> I get frustated when I follow a discussion which I can't join!

sure looks like you just joined it.

> I want to say that if types will eventually be classes in the Far =
Future,
> a SequenceType could be implemented.

yeah, but eventually is not good enough in this case; the
string methods are already checked into the current CVS
version.

</F>



From guido@cnri.reston.va.us  Mon Feb 14 17:58:28 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 14 Feb 2000 12:58:28 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python dynload_mac.c,2.2,2.3
Message-ID: <200002141758.MAA21253@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory eric:/projects/python/develop/guido/src/Python

Modified Files:
	dynload_mac.c 
Log Message:
Patch by Jack Jansen:

If we attempt to import a dynamic module in a newer (or older) version
of Python give an error message tailored to the situation (Python too
new/old).


Index: dynload_mac.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/dynload_mac.c,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -r2.2 -r2.3
*** dynload_mac.c	1999/12/22 14:09:35	2.2
--- dynload_mac.c	2000/02/14 17:58:25	2.3
***************
*** 115,118 ****
--- 115,130 ----
  			      kLoadCFrag, &connID, &mainAddr,
  			      errMessage);
+ 	if ( err == cfragImportTooOldErr || err == cfragImportTooNewErr ) {
+ 		/*
+ 		** Special-case code: if PythonCore is too old or too new this means
+ 		** the dynamic module was meant for a different Python.
+ 		*/
+ 		if (errMessage[0] == 10 && strncmp((char *)errMessage+1, "PythonCore", 10) == 0 ) {
+ 			sprintf(buf, "Dynamic module was built for %s version of MacPython",
+ 				(err == cfragImportTooOldErr ? "a newer" : "an older"));
+ 			PyErr_SetString(PyExc_ImportError, buf);
+ 			return NULL;
+ 		}
+ 	}
  	if ( err ) {
  		sprintf(buf, "%.*s: %.200s",



From fdrake@weyr.cnri.reston.va.us  Mon Feb 14 21:30:55 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 14 Feb 2000 16:30:55 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib colorsys.py,1.3,1.4
Message-ID: <200002142130.QAA19401@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	colorsys.py 
Log Message:

Fix the question marks next to the expansions of some of the
colorspace name abbreviations, based on email from Gerrit Holl
<gerrit.holl@pobox.com>.


Index: colorsys.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/colorsys.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** colorsys.py	1999/02/25 14:26:02	1.3
--- colorsys.py	2000/02/14 21:30:52	1.4
***************
*** 12,17 ****
  RGB: Red, Green, Blue components
  YIQ: used by composite video signals
! HLS: Hue, Luminance, S???
! HSV: Hue, Saturation, Value(?)
  """
  # References:
--- 12,17 ----
  RGB: Red, Green, Blue components
  YIQ: used by composite video signals
! HLS: Hue, Luminance, Saturation
! HSV: Hue, Saturation, Value
  """
  # References:



From guido@cnri.reston.va.us  Mon Feb 14 21:41:53 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 14 Feb 2000 16:41:53 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts logmerge.py,1.4,1.5
Message-ID: <200002142141.QAA22383@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Modified Files:
	logmerge.py 
Log Message:
Patch by Gerrit Holl:

    * In logmerge.py: added '-r' flag to show the oldest checkin
      first instead of the newest, and getopt.getopt was used
      wrong.


Index: logmerge.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/scripts/logmerge.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** logmerge.py	1998/03/24 05:30:25	1.4
--- logmerge.py	2000/02/14 21:41:50	1.5
***************
*** 33,40 ****
      """Main program"""
      truncate_last = 0
!     opts, args = getopt.getopt(sys.argv[1:], "-t")
      for o, a in opts:
          if o == '-t':
              truncate_last = 1
      database = []
      while 1:
--- 33,43 ----
      """Main program"""
      truncate_last = 0
!     reverse = 0
!     opts, args = getopt.getopt(sys.argv[1:], "tr")
      for o, a in opts:
          if o == '-t':
              truncate_last = 1
+         elif o == '-r':
+             reverse = 1
      database = []
      while 1:
***************
*** 47,51 ****
          database[len(database):] = records
      database.sort()
!     database.reverse()
      format_output(database)
  
--- 50,55 ----
          database[len(database):] = records
      database.sort()
!     if not reverse:
!         database.reverse()
      format_output(database)
  



From guido@cnri.reston.va.us  Mon Feb 14 21:42:17 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 14 Feb 2000 16:42:17 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts crlf.py,1.1,1.2 lfcr.py,1.2,1.3
Message-ID: <200002142142.QAA22408@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Modified Files:
	crlf.py lfcr.py 
Log Message:
Patch by Gerrit Holl:

* In crlf.py and lfcr.py: regsub -> re



Index: crlf.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/scripts/crlf.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** crlf.py	1998/09/14 15:46:41	1.1
--- crlf.py	2000/02/14 21:42:14	1.2
***************
*** 3,7 ****
  "Replace CRLF with LF in argument files.  Print names of changed files."
  
! import sys, regsub, os
  for file in sys.argv[1:]:
      if os.path.isdir(file):
--- 3,7 ----
  "Replace CRLF with LF in argument files.  Print names of changed files."
  
! import sys, re, os
  for file in sys.argv[1:]:
      if os.path.isdir(file):
***************
*** 12,16 ****
          print file, "Binary!"
          continue
!     newdata = regsub.gsub("\r\n", "\n", data)
      if newdata != data:
          print file
--- 12,16 ----
          print file, "Binary!"
          continue
!     newdata = re.sub("\r\n", "\n", data)
      if newdata != data:
          print file

Index: lfcr.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/scripts/lfcr.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lfcr.py	1998/09/14 15:56:40	1.2
--- lfcr.py	2000/02/14 21:42:14	1.3
***************
*** 3,7 ****
  "Replace LF with CRLF in argument files.  Print names of changed files."
  
! import sys, regsub, os
  for file in sys.argv[1:]:
      if os.path.isdir(file):
--- 3,7 ----
  "Replace LF with CRLF in argument files.  Print names of changed files."
  
! import sys, re, os
  for file in sys.argv[1:]:
      if os.path.isdir(file):
***************
*** 12,16 ****
          print file, "Binary!"
          continue
!     newdata = regsub.gsub("\r?\n", "\r\n", data)
      if newdata != data:
          print file
--- 12,16 ----
          print file, "Binary!"
          continue
!     newdata = re.sub("\r?\n", "\r\n", data)
      if newdata != data:
          print file



From fdrake@weyr.cnri.reston.va.us  Mon Feb 14 21:52:19 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 14 Feb 2000 16:52:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libstdtypes.tex,1.20.2.2,1.20.2.3
Message-ID: <200002142152.QAA19987@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libstdtypes.tex 
Log Message:

Per a suggestion from Gerrit Holl <gerrit.holl@pobox.com>, note that
<> is obsolescent.  This mirrors a comment added to the language ref
by Guido in June, 1998.  Mostly because nobody reads the language ref
anymore.  ;[


Index: libstdtypes.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libstdtypes.tex,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -C2 -r1.20.2.2 -r1.20.2.3
*** libstdtypes.tex	2000/01/20 15:33:24	1.20.2.2
--- libstdtypes.tex	2000/02/14 21:52:16	1.20.2.3
***************
*** 124,127 ****
--- 124,128 ----
  \index{language!ABC@\ABC{}}
  \indexii{C@\C{}}{language}
+ \code{!=} is the preferred spelling; \code{<>} is obsolescent.
  
  \end{description}



From fdrake@weyr.cnri.reston.va.us  Mon Feb 14 22:17:11 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 14 Feb 2000 17:17:11 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
Message-ID: <200002142217.RAA20106@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libcrypt.tex 
Log Message:

Revisions and example from Peter Funk <pf@artcom-gmbh.de>.


Index: libcrypt.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libcrypt.tex,v
retrieving revision 1.14
retrieving revision 1.14.4.1
diff -C2 -r1.14 -r1.14.4.1
*** libcrypt.tex	1999/03/02 17:03:35	1.14
--- libcrypt.tex	2000/02/14 22:17:08	1.14.4.1
***************
*** 1,28 ****
  \section{\module{crypt} ---
!          Function used to check \UNIX{} passwords}
  
  \declaremodule{builtin}{crypt}
    \platform{Unix}
! \modulesynopsis{The \cfunction{crypt()} function used to check \UNIX{}
!   passwords.}
  \moduleauthor{Steven D. Majewski}{sdm7g@virginia.edu}
  \sectionauthor{Steven D. Majewski}{sdm7g@virginia.edu}
  
  
! This module implements an interface to the \manpage{crypt}{3} routine,
! which is a one-way hash function based upon a modified DES algorithm;
! see the \UNIX{} man page for further details.  Possible uses include
  allowing Python scripts to accept typed passwords from the user, or
  attempting to crack \UNIX{} passwords with a dictionary.
- \index{crypt(3)}
  
  \begin{funcdesc}{crypt}{word, salt} 
! \var{word} will usually be a user's password.  \var{salt} is a
! 2-character string which will be used to select one of 4096 variations
! of DES\indexii{cipher}{DES}.  The characters in \var{salt} must be
! either \character{.}, \character{/}, or an alphanumeric character.
! Returns the hashed password as a string, which will be composed of
! characters from the same alphabet as the salt.
  \end{funcdesc}
  
  The module and documentation were written by Steve Majewski.
--- 1,44 ----
  \section{\module{crypt} ---
!          Function to check \UNIX{} passwords}
  
  \declaremodule{builtin}{crypt}
    \platform{Unix}
! \modulesynopsis{The \cfunction{crypt()} function used to check
!   \UNIX{} passwords.}
  \moduleauthor{Steven D. Majewski}{sdm7g@virginia.edu}
  \sectionauthor{Steven D. Majewski}{sdm7g@virginia.edu}
  
  
! This module implements an interface to the
! \manpage{crypt}{3}\index{crypt(3)} routine, which is a one-way hash
! function based upon a modified DES\indexii{cipher}{DES} algorithm; see
! the \UNIX{} man page for further details.  Possible uses include
  allowing Python scripts to accept typed passwords from the user, or
  attempting to crack \UNIX{} passwords with a dictionary.
  
  \begin{funcdesc}{crypt}{word, salt} 
! \var{word} will usually be a user's password as typed at a prompt or
! in a graphical interface.  \var{salt} is usually a random
! two-character string which will be used to perturb the DES algorithm
! in one of 4096 ways.  The characters in \var{salt} must be in the set
! \regexp{[./a-zA-Z0-9]}.  Returns the hashed password as a string,
! which will be composed of characters from the same alphabet as the
! salt (the first two characters represent the salt itself).
  \end{funcdesc}
+ 
+ 
+ A simple example illustrating typical use:
+ 
+ \begin{verbatim}
+ import crypt, getpass, pwd
+ def login():
+     username = raw_input('Python login:')
+     cryptedpasswd = pwd.getpwnam(username)[1]
+     if cryptedpasswd:
+         if cryptedpasswd == 'x' or cryptedpasswd == '*': 
+             raise "Sorry, currently no support for shadow passwords"
+         cleartext = getpass.getpass()
+         return crypt(cleartext, cryptedpasswd[0:2]) == cryptedpasswd
+ \end{verbatim}
  
  The module and documentation were written by Steve Majewski.



From akuchlin@CNRI.Reston.VA.US  Mon Feb 14 22:22:08 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Mon, 14 Feb 2000 17:22:08 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects abstract.c,2.28,2.29
Message-ID: <200002142222.RAA19507@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory amarok:/home/akuchlin/src/Python-1.5/Objects

Modified Files:
	abstract.c 
Log Message:
Make multiplying a sequence by a long integer (5L * 'b') legal


Index: abstract.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/abstract.c,v
retrieving revision 2.28
retrieving revision 2.29
diff -C2 -r2.28 -r2.29
*** abstract.c	1999/10/12 19:54:47	2.28
--- abstract.c	2000/02/14 22:22:04	2.29
***************
*** 385,392 ****
  	m = tp->tp_as_sequence;
  	if (m && m->sq_repeat) {
! 		if (!PyInt_Check(w))
  			return type_error(
  				"can't multiply sequence with non-int");
! 		return (*m->sq_repeat)(v, (int)PyInt_AsLong(w));
  	}
  	return type_error("bad operand type(s) for *");
--- 385,403 ----
  	m = tp->tp_as_sequence;
  	if (m && m->sq_repeat) {
! 		long mul_value;
! 
! 		if (PyInt_Check(w)) {
! 			mul_value = PyInt_AsLong(w);
! 		}
! 		else if (PyLong_Check(w)) {
! 			mul_value = PyLong_AsLong(w);
! 			if (PyErr_Occurred())
!                                 return NULL; 
! 		}
! 		else {
  			return type_error(
  				"can't multiply sequence with non-int");
! 		}
! 		return (*m->sq_repeat)(v, (int)mul_value);
  	}
  	return type_error("bad operand type(s) for *");



From Fredrik Lundh" <effbot@telia.com  Mon Feb 14 22:39:47 2000
From: Fredrik Lundh" <effbot@telia.com (Fredrik Lundh)
Date: Mon, 14 Feb 2000 23:39:47 +0100
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
References: <200002142217.RAA20106@weyr.cnri.reston.va.us>
Message-ID: <007a01bf773c$66342620$34aab5d4@hagrid>

mr. nitpicker strikes again:

> + \begin{verbatim}
> + import crypt, getpass, pwd
> + def login():
> +     username =3D raw_input('Python login:')
> +     cryptedpasswd =3D pwd.getpwnam(username)[1]
> +     if cryptedpasswd:

shouldn't this function return true if the
password is not required?

> +         if cryptedpasswd =3D=3D 'x' or cryptedpasswd =3D=3D '*':=20

in ("x", "*"):

> +             raise "Sorry, currently no support for shadow passwords"
> +         cleartext =3D getpass.getpass()
> +         return crypt(cleartext, cryptedpasswd[0:2]) =3D=3D =
cryptedpasswd

return crypt.crypt(cleartext, cryptedpasswd[:2]) =3D=3D cryptedpasswd

> + \end{verbatim}
>  =20
>   The module and documentation were written by Steve Majewski,

with additions by Peter Funk.

</F>



From pf@artcom-gmbh.de  Tue Feb 15 00:37:33 2000
From: pf@artcom-gmbh.de (Peter Funk)
Date: Tue, 15 Feb 2000 01:37:33 +0100 (MET)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
In-Reply-To: <007a01bf773c$66342620$34aab5d4@hagrid> from Fredrik Lundh at "Feb 14, 2000 11:39:47 pm"
Message-ID: <m12KVzh-000Cw3C@artcom0.artcom-gmbh.de>

Hi!

Fredrik Lundh wrote:
> mr. nitpicker strikes again:
> 
> > + \begin{verbatim}
> > + import crypt, getpass, pwd
> > + def login():
> > +     username = raw_input('Python login:')
> > +     cryptedpasswd = pwd.getpwnam(username)[1]
> > +     if cryptedpasswd:
> 
> shouldn't this function return true if the
> password is not required?

Yes.  Indeed.

> > +         if cryptedpasswd == 'x' or cryptedpasswd == '*': 
> 
> in ("x", "*"):

I must have programmed in Modula-2 and C for too long. :-(

> > +             raise "Sorry, currently no support for shadow passwords"
> > +         cleartext = getpass.getpass()
> > +         return crypt(cleartext, cryptedpasswd[0:2]) == cryptedpasswd
> 
> return crypt.crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd

Argg... :-(

> > + \end{verbatim}
> >   
> >   The module and documentation were written by Steve Majewski,
> 
> with additions by Peter Funk.

I hadn't imagined, that I could submit so many bad lines in such a
short example. :-(  I will try to prepare my next patches more
carefully!  Thanks Fredrik.

Regards, Peter
-- 
Peter Funk, Oldenburger Str.86, 27777 Ganderkesee, Tel: 04222 9502 70, Fax: -60


From gstein@lyra.org  Tue Feb 15 01:17:17 2000
From: gstein@lyra.org (Greg Stein)
Date: Mon, 14 Feb 2000 17:17:17 -0800 (PST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
In-Reply-To: <m12KVzh-000Cw3C@artcom0.artcom-gmbh.de>
Message-ID: <Pine.LNX.4.10.10002141714570.7924-100000@nebula.lyra.org>

On Tue, 15 Feb 2000, Peter Funk wrote:
> Fredrik Lundh wrote:
>...
> > > +         if cryptedpasswd == 'x' or cryptedpasswd == '*': 
> > 
> > in ("x", "*"):
> 
> I must have programmed in Modula-2 and C for too long. :-(

Actually, it is arguable which is faster. Using the "in" form means that
you construct the tuple at runtime, then perform the "in" check. The
version using "or" is simply a couple comparisons.

In other words, it really comes down to which form is most readable. I
think Peter's original form using "or" is more readable. Fredrik's is
easier to extend to include more alternatives. Your call :-)

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/



From guido@cnri.reston.va.us  Tue Feb 15 14:51:48 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 09:51:48 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects intobject.c,2.37,2.38
Message-ID: <200002151451.JAA23209@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	intobject.c 
Log Message:
In response to one particular complaint on edu-sig, change some error
messages from "OverflowError: integer pow()" to "OverflowError:
integer exponentiation".  (Not that this takes care of the complaint
in general that the error messages could be greatly improved. :-)


Index: intobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/intobject.c,v
retrieving revision 2.37
retrieving revision 2.38
diff -C2 -r2.37 -r2.38
*** intobject.c	2000/01/20 22:32:54	2.37
--- intobject.c	2000/02/15 14:51:46	2.38
***************
*** 578,582 ****
  				break; /* Avoid ix / 0 */
  			if (ix / temp != prev)
! 				return err_ovf("integer pow()");
  		}
  	 	iw >>= 1;	/* Shift exponent down by 1 bit */
--- 578,582 ----
  				break; /* Avoid ix / 0 */
  			if (ix / temp != prev)
! 				return err_ovf("integer exponentiation");
  		}
  	 	iw >>= 1;	/* Shift exponent down by 1 bit */
***************
*** 585,589 ****
  	 	temp *= temp;	/* Square the value of temp */
  	 	if (prev!=0 && temp/prev!=prev)
! 			return err_ovf("integer pow()");
  	 	if (iz) {
  			/* If we did a multiplication, perform a modulo */
--- 585,589 ----
  	 	temp *= temp;	/* Square the value of temp */
  	 	if (prev!=0 && temp/prev!=prev)
! 			return err_ovf("integer exponentiation");
  	 	if (iz) {
  			/* If we did a multiplication, perform a modulo */
***************
*** 631,635 ****
  			break; /* 0 to some power -- avoid ix / 0 */
  		if (ix / iv != prev)
! 			return err_ovf("integer pow()");
  	}
  	return PyInt_FromLong(ix);
--- 631,635 ----
  			break; /* 0 to some power -- avoid ix / 0 */
  		if (ix / iv != prev)
! 			return err_ovf("integer exponentiation");
  	}
  	return PyInt_FromLong(ix);



From guido@cnri.reston.va.us  Tue Feb 15 17:15:39 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 12:15:39 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle TODO.txt,1.11,1.12
Message-ID: <200002151715.MAA24003@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	TODO.txt 
Log Message:
Tiny addition.


Index: TODO.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/TODO.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** TODO.txt	1999/09/09 14:16:02	1.11
--- TODO.txt	2000/02/15 17:15:36	1.12
***************
*** 31,35 ****
  - make backups when saving
  - check file mtimes at various points
! - interface with RCS/CVS/Perforce ???
  - status bar???
  - better help?
--- 31,35 ----
  - make backups when saving
  - check file mtimes at various points
! - Pluggable interface with RCS/CVS/Perforce/Clearcase
  - status bar???
  - better help?



From guido@cnri.reston.va.us  Tue Feb 15 17:16:42 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 12:16:42 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle README.txt,1.6,1.7
Message-ID: <200002151716.MAA24025@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	README.txt 
Log Message:
Updated for pending IDLE 0.5 release (still very rough -- just getting
it out in a more convenient format than CVS).



Index: README.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/README.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** README.txt	1999/04/07 18:41:59	1.6
--- README.txt	2000/02/15 17:16:40	1.7
***************
*** 1,4 ****
! IDLE 0.4 - 7 April 1999
! -----------------------
  
  For news about this release, see the file NEWS.txt.  (For a more
--- 1,4 ----
! IDLE 0.5 - February 2000
! ------------------------
  
  For news about this release, see the file NEWS.txt.  (For a more
***************
*** 14,20 ****
  - works on Windows and Unix (probably works on Mac too)
  
! The main program is in the file "idle"; on Windows you can use idle.pyw
! to avoid popping up a DOS console.  Any arguments passed are interpreted
! as files that will be opened for editing.
  
  IDLE requires Python 1.5.2, so it is currently only usable with the
--- 14,20 ----
  - works on Windows and Unix (probably works on Mac too)
  
! The main program is in the file "idle"; on Windows you can use
! idle.pyw to avoid popping up a DOS console.  Any arguments passed are
! interpreted as files that will be opened for editing.
  
  IDLE requires Python 1.5.2, so it is currently only usable with the



From guido@cnri.reston.va.us  Tue Feb 15 17:18:00 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 12:18:00 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle NEWS.txt,1.3,1.4
Message-ID: <200002151718.MAA24046@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	NEWS.txt 
Log Message:
News update.  Probably incomplete; what else is new?


Index: NEWS.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/NEWS.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** NEWS.txt	1999/04/07 18:41:58	1.3
--- NEWS.txt	2000/02/15 17:17:58	1.4
***************
*** 3,6 ****
--- 3,33 ----
  ----------------------------------------------------------------------
  
+ New in IDLE 0.5 (2/14/2000)
+ -------------------------
+ 
+ Tons of stuff, much of it contributed by Tim Peters and Mark Hammond:
+ 
+ - Format paragraph now recognizes Python block comments and reformats
+ them correctly (MH)
+ 
+ - New version of pyclbr.py parses top-level functions and understands
+ much more of Python's syntax; this is reflected in the class and path
+ browsers (TP)
+ 
+ - Much better auto-indent; knows how to indent the insides of
+ multi-line statements (TP)
+ 
+ - Call tip window pops up when you type the name of a known function
+ followed by an open parenthesis (MH)
+ 
+ - Comment out region now inserts ## to make it stand out more (TP)
+ 
+ - New path and class browsers based on a tree widget that looks
+ familiar to Windows users
+ 
+ - Reworked script running commands to be more intuitive
+ 
+ - XXX much more?!
+ 
  New in IDLE 0.4 (4/7/99)
  ------------------------



From guido@cnri.reston.va.us  Tue Feb 15 17:19:28 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 12:19:28 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle ChangeLog,1.3,1.4
Message-ID: <200002151719.MAA24089@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	ChangeLog 
Log Message:
Updated change log.


Index: ChangeLog
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ChangeLog	1999/04/26 22:20:38	1.3
--- ChangeLog	2000/02/15 17:19:25	1.4
***************
*** 1,2 ****
--- 1,436 ----
+ Tue Feb 15 17:17:58 2000  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* NEWS.txt: News update.  Probably incomplete; what else is new?
+ 
+ 	* README.txt:
+ 	Updated for pending IDLE 0.5 release (still very rough -- just getting
+ 	it out in a more convenient format than CVS).
+ 
+ 	* TODO.txt: Tiny addition.
+ 
+ Thu Sep  9 14:16:02 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* TODO.txt: A few new TODO entries.
+ 
+ Thu Aug 26 23:06:22 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* Bindings.py: Add Python Documentation entry to Help menu.
+ 
+ 	* EditorWindow.py:
+ 	Find the help.txt file relative to __file__ or ".", not in sys.path.
+ 	(Suggested by Moshe Zadka, but implemented differently.)
+ 
+ 	Add <<python-docs>> event which, on Unix, brings up Netscape pointing
+ 	to http://www.python.doc/current/ (a local copy would be nice but its
+ 	location can't be predicted).  Windows solution TBD.
+ 
+ Wed Aug 11 14:55:43 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* TreeWidget.py:
+ 	Moshe noticed an inconsistency in his comment, so I'm rephrasing it to
+ 	be clearer.
+ 
+ 	* TreeWidget.py:
+ 	Patch inspired by Moshe Zadka to search for the Icons directory in the
+ 	same directory as __file__, rather than searching for it along sys.path.
+ 	This works better when idle is a package.
+ 
+ Thu Jul 15 13:11:02 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* TODO.txt: New wishes.
+ 
+ Sat Jul 10 13:17:35 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* IdlePrefs.py:
+ 	Make the color for stderr red (i.e. the standard warning/danger/stop
+ 	color) rather than green.  Suggested by Sam Schulenburg.
+ 
+ Fri Jun 25 17:26:34 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* PyShell.py: Close debugger when closing.  This may break a cycle.
+ 
+ 	* Debugger.py: Break cycle on close.
+ 
+ 	* ClassBrowser.py: Destroy the tree when closing.
+ 
+ 	* TreeWidget.py: Add destroy() method to recursively destroy a tree.
+ 
+ 	* PyShell.py: Extend _close() to break cycles.
+ 	Break some other cycles too (and destroy the root when done).
+ 
+ 	* EditorWindow.py:
+ 	Add _close() method that does the actual cleanup (close() asks the
+ 	user what they want first if there's unsaved stuff, and may cancel).
+ 	It closes more than before.
+ 
+ 	Add unload_extensions() method to unload all extensions; called from
+ 	_close().  It calls an extension's close() method if it has one.
+ 
+ 	* Percolator.py: Add close() method that breaks cycles.
+ 
+ 	* WidgetRedirector.py: Add unregister() method.
+ 	Unregister everything at closing.
+ 	Don't call close() in __del__, rely on explicit call to close().
+ 
+ 	* IOBinding.py, FormatParagraph.py, CallTips.py:
+ 	Add close() method that breaks a cycle.
+ 
+ Fri Jun 11 15:03:00 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* AutoIndent.py, EditorWindow.py, FormatParagraph.py:
+ 	Tim Peters smart.patch:
+ 
+ 	EditorWindow.py:
+ 
+ 	+ Added get_tabwidth & set_tabwidth "virtual text" methods, that get/set the
+ 	widget's view of what a tab means.
+ 
+ 	+ Moved TK_TABWIDTH_DEFAULT here from AutoIndent.
+ 
+ 	+ Renamed Mark's get_selection_index to get_selection_indices (sorry, Mark,
+ 	but the name was plain wrong <wink>).
+ 
+ 	FormatParagraph.py:  renamed use of get_selection_index.
+ 
+ 	AutoIndent.py:
+ 
+ 	+ Moved TK_TABWIDTH_DEFAULT to EditorWindow.
+ 
+ 	+ Rewrote set_indentation_params to use new VTW get/set_tabwidth methods.
+ 
+ 	+ Changed smart_backspace_event to delete whitespace back to closest
+ 	preceding virtual tab stop or real character (note that this may require
+ 	inserting characters if backspacing over a tab!).
+ 
+ 	+ Nuked almost references to the selection tag, in favor of using
+ 	get_selection_indices.  The sole exception is in set_region, for which no
+ 	"set_selection" abstraction has yet been agreed upon.
+ 
+ 	+ Had too much fun using the spiffy new features of the format-paragraph
+ 	cmd.
+ 
+ Thu Jun 10 17:48:02 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* FormatParagraph.py:
+ 	Code by Mark Hammond to format paragraphs embedded in comments.
+ 	Read the comments (which I reformatted using the new feature :-)
+ 	for some limitations.
+ 
+ 	* EditorWindow.py:
+ 	Added abstraction get_selection_index() (Mark Hammond).  Also
+ 	reformatted some comment blocks to show off a cool feature I'm about
+ 	to check in next.
+ 
+ 	* ClassBrowser.py:
+ 	Adapt to the new pyclbr's support of listing top-level functions.  If
+ 	this functionality is not present (e.g. when used with a vintage
+ 	Python 1.5.2 installation) top-level functions are not listed.
+ 
+ 	(Hmm...  Any distribution of IDLE 0.5 should probably include a copy
+ 	of the new pyclbr.py!)
+ 
+ 	* AutoIndent.py:
+ 	Fix off-by-one error in Tim's recent change to comment_region(): the
+ 	list of lines returned by get_region() contains an empty line at the
+ 	end representing the start of the next line, and this shouldn't be
+ 	commented out!
+ 
+ 	* CallTips.py:
+ 	Mark Hammond writes: Here is another change that allows it to work for
+ 	class creation - tries to locate an __init__ function.  Also updated
+ 	the test code to reflect your new "***" change.
+ 
+ 	* CallTipWindow.py:
+ 	Mark Hammond writes: Tim's suggestion of copying the font for the
+ 	CallTipWindow from the text control makes sense, and actually makes
+ 	the control look better IMO.
+ 
+ Wed Jun  9 20:34:57 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* CallTips.py:
+ 	Append "..." if the appropriate flag (for varargs) in co_flags is set.
+ 	Ditto "***" for kwargs.
+ 
+ Tue Jun  8 13:06:07 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* ReplaceDialog.py:
+ 	Hmm...  Tim didn't turn "replace all" into a single undo block.
+ 	I think I like it better if it os, so here.
+ 
+ 	* ReplaceDialog.py: Tim Peters: made replacement atomic for undo/redo.
+ 
+ 	* AutoIndent.py: Tim Peters:
+ 
+ 	+ Set usetabs=1.  Editing pyclbr.py was driving me nuts <0.6 wink>.
+ 	usetabs=1 is the Emacs pymode default too, and thanks to indentwidth !=
+ 	tabwidth magical usetabs disabling, new files are still created with tabs
+ 	turned off.  The only implication is that if you open a file whose first
+ 	indent is a single tab, IDLE will now magically use tabs for that file (and
+ 	set indentwidth to 8).  Note that the whole scheme doesn't work right for
+ 	PythonWin, though, since Windows users typically set tabwidth to 4; Mark
+ 	probably has to hide the IDLE algorithm from them (which he already knows).
+ 
+ 	+ Changed comment_region_event to stick "##" in front of every line.  The
+ 	"holes" previously left on blank lines were visually confusing (made it
+ 	needlessly hard to figure out what to uncomment later).
+ 
+ Mon Jun  7 15:38:40 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* TreeWidget.py, ObjectBrowser.py:
+ 	Remove unnecessary reference to pyclbr from test() code.
+ 
+ 	* PyParse.py: Tim Peters:
+ 
+ 	Smarter logic for finding a parse synch point.
+ 
+ 	Does a half to a fifth the work in normal cases; don't notice the speedup,
+ 	but makes  more breathing room for other extensions.
+ 
+ 	Speeds terrible cases by at least a factor of 10. "Terrible" == e.g. you put
+ 	""" at the start of Tkinter.py, undo it, zoom to the bottom, and start
+ 	typing in code.  Used to take about 8 seconds for ENTER to respond, now some
+ 	large fraction of a second.  The new code gets indented correctly, despite
+ 	that it all remains "string colored" until the colorizer catches up (after
+ 	which, ENTER appears instantaneous again).
+ 
+ Fri Jun  4 19:21:19 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* extend.py: Might as well enable CallTips by default.
+ 	If there are too many complaints I'll remove it again or fix it.
+ 
+ Thu Jun  3 14:32:16 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* AutoIndent.py, EditorWindow.py, PyParse.py:
+ 	New offerings by Tim Peters; he writes:
+ 
+ 	IDLE is now the first Python editor in the Universe not confused by my
+ 	doctest.py <wink>.
+ 
+ 	As threatened, this defines IDLE's is_char_in_string function as a
+ 	method of EditorWindow.  You just need to define one similarly in
+ 	whatever it is you pass as editwin to AutoIndent; looking at the
+ 	EditorWindow.py part of the patch should make this clear.
+ 
+ 	* GrepDialog.py: Enclose pattern in quotes in status message.
+ 
+ 	* CallTips.py:
+ 	Mark Hammond fixed some comments and improved the way the tip text is
+ 	constructed.
+ 
+ Wed Jun  2 18:18:57 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* CallTips.py:
+ 	My fix to Mark's code: restore the universal check on <KeyRelease>.
+ 	Always cancel on <Key-Escape> or <ButtonPress>.
+ 
+ 	* CallTips.py:
+ 	A version that Mark Hammond posted to the newsgroup.  Has some newer
+ 	stuff for getting the tip.  Had to fix the Key-( and Key-) events
+ 	for Unix.  Will have to re-apply my patch for catching KeyRelease and
+ 	ButtonRelease events.
+ 
+ 	* CallTipWindow.py, CallTips.py:
+ 	Call tips by Mark Hammond (plus tiny fix by me.)
+ 
+ 	* IdleHistory.py:
+ 	Changes by Mark Hammond: (1) support optional output_sep argument to
+ 	the constructor so he can eliminate the sys.ps2 that PythonWin leaves
+ 	in the source; (2) remove duplicate history items.
+ 
+ 	* AutoIndent.py:
+ 	Changes by Mark Hammond to allow using IDLE extensions in PythonWin as
+ 	well: make three dialog routines instance variables.
+ 
+ 	* EditorWindow.py:
+ 	Change by Mark Hammond to allow using IDLE extensions in PythonWin as
+ 	well: make three dialog routines instance variables.
+ 
+ Tue Jun  1 20:06:44 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* AutoIndent.py: Hah!  A fix of my own to Tim's code!
+ 	Unix bindings for <<toggle-tabs>> and <<change-indentwidth>> were
+ 	missing, and somehow that meant the events were never generated,
+ 	even though they were in the menu.  The new Unix bindings are now
+ 	the same as the Windows bindings (M-t and M-u).
+ 
+ 	* AutoIndent.py, PyParse.py, PyShell.py: Tim Peters again:
+ 
+ 	The new version (attached) is fast enough all the time in every real module
+ 	I have <whew!>.  You can make it slow by, e.g., creating an open list with
+ 	5,000 90-character identifiers (+ trailing comma) each on its own line, then
+ 	adding an item to the end -- but that still consumes less than a second on
+ 	my P5-166.  Response time in real code appears instantaneous.
+ 
+ 	Fixed some bugs.
+ 
+ 	New feature:  when hitting ENTER and the cursor is beyond the line's leading
+ 	indentation, whitespace is removed on both sides of the cursor; before
+ 	whitespace was removed only on the left; e.g., assuming the cursor is
+ 	between the comma and the space:
+ 
+ 	def something(arg1, arg2):
+ 	                   ^ cursor to the left of here, and hit ENTER
+ 	               arg2):   # new line used to end up here
+ 	              arg2):    # but now lines up the way you expect
+ 
+ 	New hack:  AutoIndent has grown a context_use_ps1 Boolean config option,
+ 	defaulting to 0 (false) and set to 1 (only) by PyShell.  Reason:  handling
+ 	the fancy stuff requires looking backward for a parsing synch point; ps1
+ 	lines are the only sensible thing to look for in a shell window, but are a
+ 	bad thing to look for in a file window (ps1 lines show up in my module
+ 	docstrings often).  PythonWin's shell should set this true too.
+ 
+ 	Persistent problem:  strings containing def/class can still screw things up
+ 	completely.  No improvement.  Simplest workaround is on the user's head, and
+ 	consists of inserting e.g.
+ 
+ 	def _(): pass
+ 
+ 	(or any other def/class) after the end of the multiline string that's
+ 	screwing them up.  This is especially irksome because IDLE's syntax coloring
+ 	is *not* confused, so when this happens the colors don't match the
+ 	indentation behavior they see.
+ 
+ 	* AutoIndent.py: Tim Peters again:
+ 
+ 	[Tim, after adding some bracket smarts to AutoIndent.py]
+ 	> ...
+ 	> What it can't possibly do without reparsing large gobs of text is
+ 	> suggest a reasonable indent level after you've *closed* a bracket
+ 	> left open on some previous line.
+ 	> ...
+ 
+ 	The attached can, and actually fast enough to use -- most of the time.  The
+ 	code is tricky beyond belief to achieve that, but it works so far; e.g.,
+ 
+ 	        return len(string.expandtabs(str[self.stmt_start :
+ 	                                         ^ indents to caret
+ 	                                         i],
+ 	                                     ^ indents to caret
+ 	                                     self.tabwidth)) + 1
+ 	    ^ indents to caret
+ 
+ 	It's about as smart as pymode now, wrt both bracket and backslash
+ 	continuation rules.  It does require reparsing large gobs of text, and if it
+ 	happens to find something that looks like a "def" or "class" or sys.ps1
+ 	buried in a multiline string, but didn't suck up enough preceding text to
+ 	see the start of the string, it's completely hosed.  I can't repair that --
+ 	it's just too slow to reparse from the start of the file all the time.
+ 
+ 	AutoIndent has grown a new num_context_lines tuple attribute that controls
+ 	how far to look back, and-- like other params --this could/should be made
+ 	user-overridable at startup and per-file on the fly.
+ 
+ 	* PyParse.py: New file by Tim Peters:
+ 
+ 	One new file in the attached, PyParse.py.  The LineStudier (whatever it was
+ 	called <wink>) class was removed from AutoIndent; PyParse subsumes its
+ 	functionality.
+ 
+ 	* AutoIndent.py: Tim Peters keeps revising this module (more to come):
+ 
+ 	Removed "New tabwidth" menu binding.
+ 
+ 	Added "a tab means how many spaces?" dialog to block tabify and untabify.  I
+ 	think prompting for this is good now:  they're usually at-most-once-per-file
+ 	commands, and IDLE can't let them change tabwidth from the Tk default
+ 	anymore, so IDLE can no longer presume to have any idea what a tab means.
+ 
+ 	Irony:  for the purpose of keeping comments aligned via tabs, Tk's
+ 	non-default approach is much nicer than the Emacs/Notepad/Codewright/vi/etc
+ 	approach.
+ 
+ 	* EditorWindow.py:
+ 	1. Catch NameError on import (could be raised by case mismatch on Windows).
+ 	2. No longer need to reset pyclbr cache and show watch cursor when calling
+ 	   ClassBrowser -- the ClassBrowser takes care of pyclbr and the TreeWidget
+ 	   takes care of the watch cursor.
+ 	3. Reset the focus to the current window after error message about class
+ 	   browser on buffer without filename.
+ 
+ 	* Icons/minusnode.gif, Icons/plusnode.gif: Missed a few.
+ 
+ 	* ClassBrowser.py, PathBrowser.py: Rewritten based on TreeWidget.py
+ 
+ 	* ObjectBrowser.py: Object browser, based on TreeWidget.py.
+ 
+ 	* TreeWidget.py: Tree widget done right.
+ 
+ 	* ToolTip.py: As yet unused code for tool tips.
+ 
+ 	* ScriptBinding.py:
+ 	Ensure sys.argv[0] is the script name on Run Script.
+ 
+ 	* ZoomHeight.py: Move zoom height functionality to separate function.
+ 
+ 	* Icons/folder.gif, Icons/openfolder.gif, Icons/python.gif, Icons/tk.gif:
+ 	A few icons used by ../TreeWidget.py and its callers.
+ 
+ 	* AutoIndent.py: New version by Tim Peters improves block opening test.
+ 
+ Fri May 21 04:46:17 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* Attic/History.py, PyShell.py: Rename History to IdleHistory.
+ 	Add isatty() to pseudo files.
+ 
+ 	* StackViewer.py: Make initial stack viewer wider
+ 
+ 	* TODO.txt: New wishes
+ 
+ 	* AutoIndent.py, EditorWindow.py, PyShell.py:
+ 	Much improved autoindent and handling of tabs,
+ 	by Tim Peters.
+ 
+ Mon May  3 15:49:52 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* AutoIndent.py, EditorWindow.py, FormatParagraph.py, UndoDelegator.py:
+ 	Tim Peters writes:
+ 
+ 	I'm still unsure, but couldn't stand the virtual event trickery so tried a
+ 	different sin (adding undo_block_start/stop methods to the Text instance in
+ 	EditorWindow.py).  Like it or not, it's efficient and works <wink>.  Better
+ 	idea?
+ 
+ 	Give the attached a whirl.  Even if you hate the implementation, I think
+ 	you'll like the results.  Think I caught all the "block edit" cmds,
+ 	including Format Paragraph, plus subtler ones involving smart indents and
+ 	backspacing.
+ 
+ 	* WidgetRedirector.py: Tim Peters writes:
+ 
+ 	[W]hile trying to dope out how redirection works, stumbled into two
+ 	possible glitches.  In the first, it doesn't appear to make sense to try to
+ 	rename a command that's already been destroyed; in the second, the name
+ 	"previous" doesn't really bring to mind "ignore the previous value" <wink>.
+ 
+ Fri Apr 30 19:39:25 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* __init__.py: Support for using idle as a package.
+ 
+ 	* PathBrowser.py:
+ 	Avoid listing files more than once (e.g. foomodule.so has two hits:
+ 	once for foo + module.so, once for foomodule + .so).
+ 
+ Mon Apr 26 22:20:38 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* ChangeLog, ColorDelegator.py, PyShell.py: Tim Peters strikes again:
+ 
+ 	Ho ho ho -- that's trickier than it sounded!  The colorizer is working with
+ 	"line.col" strings instead of Text marks, and the absolute coordinates of
+ 	the point of interest can change across the self.update call (voice of
+ 	baffled experience, when two quick backspaces no longer fooled it, but a
+ 	backspace followed by a quick ENTER did <wink>).
+ 
+ 	Anyway, the attached appears to do the trick.  CPU usage goes way up when
+ 	typing quickly into a long triple-quoted string, but the latency is fine for
+ 	me (a relatively fast typist on a relatively slow machine).  Most of the
+ 	changes here are left over from reducing the # of vrbl names to help me
+ 	reason about the logic better; I hope the code is a *little* easier to
+ 
+ Fri Apr 23 14:01:25 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* EditorWindow.py:
+ 	Provide full arguments to __import__ so it works in packagized IDLE.
+ 
  Thu Apr 22 23:20:17 1999  Guido van Rossum  <guido@cnri.reston.va.us>
  



From fdrake@acm.org  Tue Feb 15 17:42:21 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 15 Feb 2000 12:42:21 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
In-Reply-To: <Pine.LNX.4.10.10002141714570.7924-100000@nebula.lyra.org>
References: <m12KVzh-000Cw3C@artcom0.artcom-gmbh.de>
 <Pine.LNX.4.10.10002141714570.7924-100000@nebula.lyra.org>
Message-ID: <14505.36861.554432.428111@weyr.cnri.reston.va.us>

Greg Stein writes:
 > Actually, it is arguable which is faster. Using the "in" form means that
 > you construct the tuple at runtime, then perform the "in" check. The
 > version using "or" is simply a couple comparisons.

  Actually, I think the tuple is compiled to an entry in the constants 
table when the contents are also constants (Jeremy, you're playing
with this nowadays; any insight?).

 > In other words, it really comes down to which form is most readable. I
 > think Peter's original form using "or" is more readable. Fredrik's is
 > easier to extend to include more alternatives. Your call :-)

  The two == tests are faster, at least when comparing a local var to
a local var or a constant.


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From guido@cnri.reston.va.us  Tue Feb 15 18:02:14 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:02:14 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle ClassBrowser.py,1.10,1.11
Message-ID: <200002151802.NAA24237@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	ClassBrowser.py 
Log Message:
Add an XXX comment about the ClassBrowser AIP.


Index: ClassBrowser.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/ClassBrowser.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** ClassBrowser.py	1999/06/25 17:08:19	1.10
--- ClassBrowser.py	2000/02/15 18:02:11	1.11
***************
*** 31,34 ****
--- 31,36 ----
  
      def __init__(self, flist, name, path):
+         # XXX This API should change, if the file doesn't end in ".py"
+         # XXX the code here is bogus!
          self.name = name
          self.file = os.path.join(path[0], self.name + ".py")



From guido@cnri.reston.va.us  Tue Feb 15 18:03:04 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:03:04 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle WindowList.py,1.6,1.7
Message-ID: <200002151803.NAA24260@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	WindowList.py 
Log Message:
Correct a typo and remove an unqualified except that was hiding the error.


Index: WindowList.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/WindowList.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** WindowList.py	1999/02/17 17:34:25	1.6
--- WindowList.py	2000/02/15 18:03:01	1.7
***************
*** 40,45 ****
      def unregister_callback(self, callback):
          try:
!             self.callback.remove(callback)
!         except:
              pass
  
--- 40,45 ----
      def unregister_callback(self, callback):
          try:
!            self.callbacks.remove(callback)
!         except ValueError:
              pass
  



From guido@cnri.reston.va.us  Tue Feb 15 18:03:43 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:03:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle StackViewer.py,1.13,1.14
Message-ID: <200002151803.NAA24282@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	StackViewer.py 
Log Message:
New stack viewer, uses a tree widget.
(XXX: the debugger doesn't yet use this.)


Index: StackViewer.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/StackViewer.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** StackViewer.py	1999/05/21 04:45:45	1.13
--- StackViewer.py	2000/02/15 18:03:40	1.14
***************
*** 1,176 ****
  import string
- import sys
- import os
  from Tkinter import *
  import linecache
- from repr import Repr
- from WindowList import ListedToplevel
  
! from ScrolledList import ScrolledList
  
  
! class StackBrowser:
  
!     def __init__(self, root, flist, stack=None):
!         self.top = top = ListedToplevel(root)
!         top.protocol("WM_DELETE_WINDOW", self.close)
!         top.bind("<Key-Escape>", self.close)
!         top.wm_title("Stack viewer")
!         top.wm_iconname("Stack")
!         # Create help label
!         self.helplabel = Label(top,
!             text="Click once to view variables; twice for source",
!             borderwidth=2, relief="groove")
!         self.helplabel.pack(fill="x")
!         #
!         self.sv = StackViewer(top, flist, self)
!         if stack is None:
!             stack = get_stack()
!         self.sv.load_stack(stack)
! 
!     def close(self, event=None):
!         self.top.destroy()
! 
!     localsframe = None
!     localsviewer = None
!     localsdict = None
!     globalsframe = None
!     globalsviewer = None
!     globalsdict = None
!     curframe = None
! 
!     def show_frame(self, (frame, lineno)):
!         if frame is self.curframe:
!             return
!         self.curframe = None
!         if frame.f_globals is not self.globalsdict:
!             self.show_globals(frame)
!         self.show_locals(frame)
!         self.curframe = frame
! 
!     def show_globals(self, frame):
!         title = "Global Variables"
!         if frame.f_globals.has_key("__name__"):
!             try:
!                 name = str(frame.f_globals["__name__"]) + ""
!             except:
!                 name = ""
!             if name:
!                 title = title + " in module " + name
!         self.globalsdict = None
!         if self.globalsviewer:
!             self.globalsviewer.close()
!         self.globalsviewer = None
!         if not self.globalsframe:
!             self.globalsframe = Frame(self.top)
!         self.globalsdict = frame.f_globals
!         self.globalsviewer = NamespaceViewer(
!             self.globalsframe,
!             title,
!             self.globalsdict)
!         self.globalsframe.pack(fill="both", side="bottom")
! 
!     def show_locals(self, frame):
!         self.localsdict = None
!         if self.localsviewer:
!             self.localsviewer.close()
!         self.localsviewer = None
!         if frame.f_locals is not frame.f_globals:
!             title = "Local Variables"
!             code = frame.f_code
!             funcname = code.co_name
!             if funcname not in ("?", "", None):
!                 title = title + " in " + funcname
!             if not self.localsframe:
!                 self.localsframe = Frame(self.top)
!             self.localsdict = frame.f_locals
!             self.localsviewer = NamespaceViewer(
!                 self.localsframe,
!                 title,
!                 self.localsdict)
!             self.localsframe.pack(fill="both", side="top")
!         else:
!             if self.localsframe:
!                 self.localsframe.forget()
  
  
! class StackViewer(ScrolledList):
  
!     def __init__(self, master, flist, browser):
!         ScrolledList.__init__(self, master, width=80)
          self.flist = flist
-         self.browser = browser
-         self.stack = []
  
!     def load_stack(self, stack, index=None):
!         self.stack = stack
!         self.clear()
! ##        if len(stack) > 10:
! ##            l["height"] = 10
! ##            self.topframe.pack(expand=1)
! ##        else:
! ##            l["height"] = len(stack)
! ##            self.topframe.pack(expand=0)
!         for i in range(len(stack)):
!             frame, lineno = stack[i]
!             try:
!                 modname = frame.f_globals["__name__"]
!             except:
!                 modname = "?"
!             code = frame.f_code
!             filename = code.co_filename
!             funcname = code.co_name
!             sourceline = linecache.getline(filename, lineno)
!             sourceline = string.strip(sourceline)
!             if funcname in ("?", "", None):
!                 item = "%s, line %d: %s" % (modname, lineno, sourceline)
!             else:
!                 item = "%s.%s(), line %d: %s" % (modname, funcname,
!                                                  lineno, sourceline)
!             if i == index:
!                 item = "> " + item
!             self.append(item)
!         if index is not None:
!             self.select(index)
! 
!     def popup_event(self, event):
!         if self.stack:
!             return ScrolledList.popup_event(self, event)
! 
!     def fill_menu(self):
!         menu = self.menu
!         menu.add_command(label="Go to source line",
!                          command=self.goto_source_line)
!         menu.add_command(label="Show stack frame",
!                          command=self.show_stack_frame)
! 
!     def on_select(self, index):
!         if 0 <= index < len(self.stack):
!             self.browser.show_frame(self.stack[index])
! 
!     def on_double(self, index):
!         self.show_source(index)
! 
!     def goto_source_line(self):
!         index = self.listbox.index("active")
!         self.show_source(index)
! 
!     def show_stack_frame(self):
!         index = self.listbox.index("active")
!         if 0 <= index < len(self.stack):
!             self.browser.show_frame(self.stack[index])
! 
!     def show_source(self, index):
!         if not (0 <= index < len(self.stack)):
!             return
!         frame, lineno = self.stack[index]
          code = frame.f_code
          filename = code.co_filename
!         if os.path.isfile(filename):
              edit = self.flist.open(filename)
!             if edit:
!                 edit.gotoline(lineno)
  
  
  def get_stack(t=None, f=None):
      if t is None:
--- 1,105 ----
  import string
  from Tkinter import *
  import linecache
  
! from TreeWidget import TreeNode, TreeItem, ScrolledCanvas
! from ObjectBrowser import ObjectTreeItem, make_objecttreeitem
! from OldStackViewer import StackViewer, NamespaceViewer
! 
! def StackBrowser(root, flist=None, stack=None):
!     top = Toplevel(root)
!     sc = ScrolledCanvas(top, bg="white", highlightthickness=0)
!     sc.frame.pack(expand=1, fill="both")
!     item = StackTreeItem(flist)
!     node = TreeNode(sc.canvas, None, item)
!     node.expand()
  
+ class StackTreeItem(TreeItem):
  
!     def __init__(self, flist=None):
!         self.flist = flist
!         self.stack = get_stack()
!         self.text = get_exception()
  
!     def GetText(self):
!         return self.text
  
+     def GetSubList(self):
+         sublist = []
+         for info in self.stack:
+             item = FrameTreeItem(info, self.flist)
+             sublist.append(item)
+         return sublist
  
! class FrameTreeItem(TreeItem):
  
!     def __init__(self, info, flist):
!         self.info = info
          self.flist = flist
  
!     def GetText(self):
!         frame, lineno = self.info
!         try:
!             modname = frame.f_globals["__name__"]
!         except:
!             modname = "?"
          code = frame.f_code
          filename = code.co_filename
!         funcname = code.co_name
!         sourceline = linecache.getline(filename, lineno)
!         sourceline = string.strip(sourceline)
!         if funcname in ("?", "", None):
!             item = "%s, line %d: %s" % (modname, lineno, sourceline)
!         else:
!             item = "%s.%s(...), line %d: %s" % (modname, funcname,
!                                              lineno, sourceline)
! ##        if i == index:
! ##            item = "> " + item
!         return item
! 
!     def GetSubList(self):
!         frame, lineno = self.info
!         sublist = []
!         if frame.f_globals is not frame.f_locals:
!             item = VariablesTreeItem("<locals>", frame.f_locals, self.flist)
!             sublist.append(item)
!         item = VariablesTreeItem("<globals>", frame.f_globals, self.flist)
!         sublist.append(item)
!         return sublist
! 
!     def OnDoubleClick(self):
!         if self.flist:
!             frame, lineno = self.info
!             filename = frame.f_code.co_filename
              edit = self.flist.open(filename)
!             edit.gotoline(lineno)
! 
! class VariablesTreeItem(ObjectTreeItem):
! 
!     def GetText(self):
!         return self.labeltext
! 
!     def GetLabelText(self):
!         return None
  
+     def IsExpandable(self):
+         return len(self.object) > 0
  
+     def keys(self):
+         return self.object.keys()
+ 
+     def GetSubList(self):
+         sublist = []
+         for key in self.keys():
+             try:
+                 value = self.object[key]
+             except KeyError:
+                 continue
+             def setfunction(value, key=key, object=self.object):
+                 object[key] = value
+             item = make_objecttreeitem(key + " =", value, setfunction)
+             sublist.append(item)
+         return sublist
+         
  def get_stack(t=None, f=None):
      if t is None:
***************
*** 190,195 ****
      return stack
  
! 
! def getexception(type=None, value=None):
      if type is None:
          type = sys.last_type
--- 119,123 ----
      return stack
  
! def get_exception(type=None, value=None):
      if type is None:
          type = sys.last_type
***************
*** 201,276 ****
          s = s + ": " + str(value)
      return s
- 
- 
- class NamespaceViewer:
- 
-     def __init__(self, master, title, dict=None):
-         width = 0
-         height = 40
-         if dict:
-             height = 20*len(dict) # XXX 20 == observed height of Entry widget
-         self.master = master
-         self.title = title
-         self.repr = Repr()
-         self.repr.maxstring = 60
-         self.repr.maxother = 60
-         self.frame = frame = Frame(master)
-         self.frame.pack(expand=1, fill="both")
-         self.label = Label(frame, text=title, borderwidth=2, relief="groove")
-         self.label.pack(fill="x")
-         self.vbar = vbar = Scrollbar(frame, name="vbar")
-         vbar.pack(side="right", fill="y")
-         self.canvas = canvas = Canvas(frame,
-                                       height=min(300, max(40, height)),
-                                       scrollregion=(0, 0, width, height))
-         canvas.pack(side="left", fill="both", expand=1)
-         vbar["command"] = canvas.yview
-         canvas["yscrollcommand"] = vbar.set
-         self.subframe = subframe = Frame(canvas)
-         self.sfid = canvas.create_window(0, 0, window=subframe, anchor="nw")
-         self.load_dict(dict)
- 
-     dict = -1
- 
-     def load_dict(self, dict, force=0):
-         if dict is self.dict and not force:
-             return
-         subframe = self.subframe
-         frame = self.frame
-         for c in subframe.children.values():
-             c.destroy()
-         self.dict = None
-         if not dict:
-             l = Label(subframe, text="None")
-             l.grid(row=0, column=0)
-         else:
-             names = dict.keys()
-             names.sort()
-             row = 0
-             for name in names:
-                 value = dict[name]
-                 svalue = self.repr.repr(value) # repr(value)
-                 l = Label(subframe, text=name)
-                 l.grid(row=row, column=0, sticky="nw")
-     ##            l = Label(subframe, text=svalue, justify="l", wraplength=300)
-                 l = Entry(subframe, width=0, borderwidth=0)
-                 l.insert(0, svalue)
-     ##            l["state"] = "disabled"
-                 l.grid(row=row, column=1, sticky="nw")
-                 row = row+1
-         self.dict = dict
-         # XXX Could we use a <Configure> callback for the following?
-         subframe.update_idletasks() # Alas!
-         width = subframe.winfo_reqwidth()
-         height = subframe.winfo_reqheight()
-         canvas = self.canvas
-         self.canvas["scrollregion"] = (0, 0, width, height)
-         if height > 300:
-             canvas["height"] = 300
-             frame.pack(expand=1)
-         else:
-             canvas["height"] = height
-             frame.pack(expand=0)
  
!     def close(self):
!         self.frame.destroy()
--- 129,135 ----
          s = s + ": " + str(value)
      return s
  
! if __name__ == "__main__":
!     root = Tk()
!     root.withdraw()
!     StackBrowser(root)



From guido@cnri.reston.va.us  Tue Feb 15 18:04:11 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:04:11 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle OldStackViewer.py,NONE,1.1
Message-ID: <200002151804.NAA24305@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Added Files:
	OldStackViewer.py 
Log Message:
Adding the old stack viewer implementation back, for the debugger.





From guido@cnri.reston.va.us  Tue Feb 15 18:04:55 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:04:55 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle MultiStatusBar.py,NONE,1.1
Message-ID: <200002151804.NAA24331@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Added Files:
	MultiStatusBar.py 
Log Message:
Status bar code -- by Moshe Zadka.





From guido@cnri.reston.va.us  Tue Feb 15 18:05:18 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:05:18 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle EditorWindow.py,1.28,1.29
Message-ID: <200002151805.NAA24353@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	EditorWindow.py 
Log Message:
Support for Moshe's status bar.


Index: EditorWindow.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/EditorWindow.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** EditorWindow.py	1999/08/26 23:06:05	1.28
--- EditorWindow.py	2000/02/15 18:05:15	1.29
***************
*** 86,89 ****
--- 86,90 ----
      import Bindings
      from Tkinter import Toplevel
+     from MultiStatusBar import MultiStatusBar
  
      about_title = about_title
***************
*** 102,106 ****
          self.top = top = self.Toplevel(root, menu=self.menubar)
          self.vbar = vbar = Scrollbar(top, name='vbar')
!         self.text = text = Text(top, name='text', padx=5,
                                  foreground=cprefs.CNormal[0],
                                  background=cprefs.CNormal[1],
--- 103,108 ----
          self.top = top = self.Toplevel(root, menu=self.menubar)
          self.vbar = vbar = Scrollbar(top, name='vbar')
!         self.text_frame = text_frame = Frame(top)
!         self.text = text = Text(text_frame, name='text', padx=5,
                                  foreground=cprefs.CNormal[0],
                                  background=cprefs.CNormal[1],
***************
*** 140,144 ****
              text['font'] = ("lucida console", 8)
  #            text['font'] = ("courier new", 10)
!         text.pack(side=LEFT, fill=BOTH, expand=1)
          text.focus_set()
  
--- 142,147 ----
              text['font'] = ("lucida console", 8)
  #            text['font'] = ("courier new", 10)
!         text_frame.pack(side=LEFT, fill=BOTH, expand=1)
!         text.pack(side=TOP, fill=BOTH, expand=1)
          text.focus_set()
  
***************
*** 187,190 ****
--- 190,208 ----
              self.extensions['AutoIndent'].set_indentation_params(
                  self.ispythonsource(filename))
+         self.set_status_bar()
+ 
+     def set_status_bar(self):
+         self.status_bar = self.MultiStatusBar(self.text_frame)
+         self.status_bar.set_label('column', 'Col: ?', side=RIGHT)
+         self.status_bar.set_label('line', 'Ln: ?', side=RIGHT)
+         self.status_bar.pack(side=BOTTOM, fill=X)
+         self.text.bind('<KeyRelease>', self.set_line_and_column)
+         self.text.bind('<ButtonRelease>', self.set_line_and_column)
+         self.text.after_idle(self.set_line_and_column)
+ 
+     def set_line_and_column(self, event=None):
+         line, column = string.split(self.text.index(INSERT), '.')
+         self.status_bar.set_label('column', 'Col: %s' % column)
+         self.status_bar.set_label('line', 'Ln: %s' % line)
  
      def wakeup(self):



From guido@cnri.reston.va.us  Tue Feb 15 18:08:22 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:08:22 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle NEWS.txt,1.4,1.5
Message-ID: <200002151808.NAA24430@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	NEWS.txt 
Log Message:
Notice status back and stack viewer.


Index: NEWS.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/NEWS.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** NEWS.txt	2000/02/15 17:17:58	1.4
--- NEWS.txt	2000/02/15 18:08:19	1.5
***************
*** 8,11 ****
--- 8,16 ----
  Tons of stuff, much of it contributed by Tim Peters and Mark Hammond:
  
+ - Status bar, displaying current line/column (Moshe Zadka).
+ 
+ - Better stack viewer, using tree widget.  (XXX Only used by Stack
+ Viewer menu, not by the debugger.)
+ 
  - Format paragraph now recognizes Python block comments and reformats
  them correctly (MH)



From guido@cnri.reston.va.us  Tue Feb 15 18:11:24 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:11:24 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle ChangeLog,1.4,1.5
Message-ID: <200002151811.NAA24541@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	ChangeLog 
Log Message:
More changes.


Index: ChangeLog
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ChangeLog	2000/02/15 17:19:25	1.4
--- ChangeLog	2000/02/15 18:11:21	1.5
***************
*** 1,3 ****
! Tue Feb 15 17:17:58 2000  Guido van Rossum  <guido@cnri.reston.va.us>
  
  	* NEWS.txt: News update.  Probably incomplete; what else is new?
--- 1,22 ----
! Tue Feb 15 18:08:19 2000  Guido van Rossum  <guido@cnri.reston.va.us>
! 
! 	* NEWS.txt: Notice status bar and stack viewer.
! 
! 	* EditorWindow.py: Support for Moshe's status bar.
! 
! 	* MultiStatusBar.py: Status bar code -- by Moshe Zadka.
! 
! 	* OldStackViewer.py:
! 	Adding the old stack viewer implementation back, for the debugger.
! 
! 	* StackViewer.py: New stack viewer, uses a tree widget.
! 	(XXX: the debugger doesn't yet use this.)
! 
! 	* WindowList.py:
! 	Correct a typo and remove an unqualified except that was hiding the error.
! 
! 	* ClassBrowser.py: Add an XXX comment about the ClassBrowser AIP.
! 
! 	* ChangeLog: Updated change log.
  
  	* NEWS.txt: News update.  Probably incomplete; what else is new?



From skip@mojam.com (Skip Montanaro)  Tue Feb 15 18:12:25 2000
From: skip@mojam.com (Skip Montanaro) (Skip Montanaro)
Date: Tue, 15 Feb 2000 12:12:25 -0600 (CST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
In-Reply-To: <14505.36861.554432.428111@weyr.cnri.reston.va.us>
References: <m12KVzh-000Cw3C@artcom0.artcom-gmbh.de>
 <Pine.LNX.4.10.10002141714570.7924-100000@nebula.lyra.org>
 <14505.36861.554432.428111@weyr.cnri.reston.va.us>
Message-ID: <14505.38665.827583.106215@beluga.mojam.com>

    Fred> Greg Stein writes:
    >> Actually, it is arguable which is faster. Using the "in" form means
    >> that you construct the tuple at runtime, then perform the "in"
    >> check. The version using "or" is simply a couple comparisons.

    Fred> Actually, I think the tuple is compiled to an entry in the
    Fred> constants table when the contents are also constants (Jeremy,
    Fred> you're playing with this nowadays; any insight?).

I don't think it does.  This is one of the optimizations I implemented in my 
peephole optimizer though...

Skip Montanaro | http://www.mojam.com/
skip@mojam.com | http://www.musi-cal.com/
"Languages that change by catering to the tastes of non-users tend not to do
so well." - Doug Landauer


From guido@cnri.reston.va.us  Tue Feb 15 18:20:03 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:20:03 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle pyclbr.py,NONE,1.1
Message-ID: <200002151820.NAA24581@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Added Files:
	pyclbr.py 
Log Message:
Temporarily add a copy here for easy distribution.




From guido@cnri.reston.va.us  Tue Feb 15 18:20:31 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:20:31 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle NEWS.txt,1.5,1.6
Message-ID: <200002151820.NAA24603@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	NEWS.txt 
Log Message:
Added some clarifications.


Index: NEWS.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/NEWS.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** NEWS.txt	2000/02/15 18:08:19	1.5
--- NEWS.txt	2000/02/15 18:20:28	1.6
***************
*** 24,28 ****
  
  - Call tip window pops up when you type the name of a known function
! followed by an open parenthesis (MH)
  
  - Comment out region now inserts ## to make it stand out more (TP)
--- 24,29 ----
  
  - Call tip window pops up when you type the name of a known function
! followed by an open parenthesis.  Hit ESC or click elsewhere in the
! window to close the tip window (MH)
  
  - Comment out region now inserts ## to make it stand out more (TP)
***************
*** 31,37 ****
  familiar to Windows users
  
! - Reworked script running commands to be more intuitive
! 
! - XXX much more?!
  
  New in IDLE 0.4 (4/7/99)
--- 32,41 ----
  familiar to Windows users
  
! - Reworked script running commands to be more intuitive: I/O now
! always goes to the *Python Shell* window, and raw_input() works
! correctly.  You use F5 to import/reload a module: this adds the module
! name to the __main__ namespace.  You use Control-F5 to run a script:
! this runs the script *in* the __main__ namespace.  The latter also
! sets sys.argv[] to the script name
  
  New in IDLE 0.4 (4/7/99)



From guido@cnri.reston.va.us  Tue Feb 15 18:31:00 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:31:00 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle pyclbr.py,1.1,1.2
Message-ID: <200002151831.NAA24728@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	pyclbr.py 
Log Message:
Oops, somehow the initial checkin was botched. :-(


Index: pyclbr.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/pyclbr.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pyclbr.py	2000/02/15 18:20:01	1.1
--- pyclbr.py	2000/02/15 18:30:58	1.2
***************
*** 0 ****
--- 1,336 ----
+ """Parse a Python file and retrieve classes and methods.
+ 
+ Parse enough of a Python file to recognize class and method
+ definitions and to find out the superclasses of a class.
+ 
+ The interface consists of a single function:
+ 	readmodule(module, path)
+ module is the name of a Python module, path is an optional list of
+ directories where the module is to be searched.  If present, path is
+ prepended to the system search path sys.path.
+ The return value is a dictionary.  The keys of the dictionary are
+ the names of the classes defined in the module (including classes
+ that are defined via the from XXX import YYY construct).  The values
+ are class instances of the class Class defined here.
+ 
+ A class is described by the class Class in this module.  Instances
+ of this class have the following instance variables:
+ 	name -- the name of the class
+ 	super -- a list of super classes (Class instances)
+ 	methods -- a dictionary of methods
+ 	file -- the file in which the class was defined
+ 	lineno -- the line in the file on which the class statement occurred
+ The dictionary of methods uses the method names as keys and the line
+ numbers on which the method was defined as values.
+ If the name of a super class is not recognized, the corresponding
+ entry in the list of super classes is not a class instance but a
+ string giving the name of the super class.  Since import statements
+ are recognized and imported modules are scanned as well, this
+ shouldn't happen often.
+ 
+ BUGS
+ - Continuation lines are not dealt with at all.
+ - While triple-quoted strings won't confuse it, lines that look like
+   def, class, import or "from ... import" stmts inside backslash-continued
+   single-quoted strings are treated like code.  The expense of stopping
+   that isn't worth it.
+ - Code that doesn't pass tabnanny or python -t will confuse it, unless
+   you set the module TABWIDTH vrbl (default 8) to the correct tab width
+   for the file.
+ 
+ PACKAGE RELATED BUGS
+ - If you have a package and a module inside that or another package
+   with the same name, module caching doesn't work properly since the
+   key is the base name of the module/package.
+ - The only entry that is returned when you readmodule a package is a
+   __path__ whose value is a list which confuses certain class browsers.
+ - When code does:
+   from package import subpackage
+   class MyClass(subpackage.SuperClass):
+     ...
+   It can't locate the parent.  It probably needs to have the same
+   hairy logic that the import locator already does.  (This logic
+   exists coded in Python in the freeze package.)
+ """
+ 
+ import os
+ import sys
+ import imp
+ import re
+ import string
+ 
+ TABWIDTH = 8
+ 
+ _getnext = re.compile(r"""
+     (?P<String>
+        \""" [^"\\]* (?:
+ 			(?: \\. | "(?!"") )
+ 			[^"\\]*
+ 		    )*
+        \"""
+ 
+     |   ''' [^'\\]* (?:
+ 			(?: \\. | '(?!'') )
+ 			[^'\\]*
+ 		    )*
+ 	'''
+     )
+ 
+ |   (?P<Method>
+ 	^
+ 	(?P<MethodIndent> [ \t]* )
+ 	def [ \t]+
+ 	(?P<MethodName> [a-zA-Z_] \w* )
+ 	[ \t]* \(
+     )
+ 
+ |   (?P<Class>
+ 	^
+ 	(?P<ClassIndent> [ \t]* )
+ 	class [ \t]+
+ 	(?P<ClassName> [a-zA-Z_] \w* )
+ 	[ \t]*
+ 	(?P<ClassSupers> \( [^)\n]* \) )?
+ 	[ \t]* :
+     )
+ 
+ |   (?P<Import>
+ 	^ import [ \t]+
+ 	(?P<ImportList> [^#;\n]+ )
+     )
+ 
+ |   (?P<ImportFrom>
+ 	^ from [ \t]+
+ 	(?P<ImportFromPath>
+ 	    [a-zA-Z_] \w*
+ 	    (?:
+ 		[ \t]* \. [ \t]* [a-zA-Z_] \w*
+ 	    )*
+ 	)
+ 	[ \t]+
+ 	import [ \t]+
+ 	(?P<ImportFromList> [^#;\n]+ )
+     )
+ """, re.VERBOSE | re.DOTALL | re.MULTILINE).search
+ 
+ _modules = {}                           # cache of modules we've seen
+ 
+ # each Python class is represented by an instance of this class
+ class Class:
+ 	'''Class to represent a Python class.'''
+ 	def __init__(self, module, name, super, file, lineno):
+ 		self.module = module
+ 		self.name = name
+ 		if super is None:
+ 			super = []
+ 		self.super = super
+ 		self.methods = {}
+ 		self.file = file
+ 		self.lineno = lineno
+ 
+ 	def _addmethod(self, name, lineno):
+ 		self.methods[name] = lineno
+ 
+ class Function(Class):
+ 	'''Class to represent a top-level Python function'''
+ 	def __init__(self, module, name, file, lineno):
+ 		Class.__init__(self, module, name, None, file, lineno)
+ 	def _addmethod(self, name, lineno):
+ 		assert 0, "Function._addmethod() shouldn't be called"
+ 
+ def readmodule(module, path=[], inpackage=0):
+ 	'''Backwards compatible interface.
+ 
+ 	Like readmodule_ex() but strips Function objects from the
+ 	resulting dictionary.'''
+ 
+ 	dict = readmodule_ex(module, path, inpackage)
+ 	res = {}
+ 	for key, value in dict.items():
+ 		if not isinstance(value, Function):
+ 			res[key] = value
+ 	return res
+ 
+ def readmodule_ex(module, path=[], inpackage=0):
+ 	'''Read a module file and return a dictionary of classes.
+ 
+ 	Search for MODULE in PATH and sys.path, read and parse the
+ 	module and return a dictionary with one entry for each class
+ 	found in the module.'''
+ 
+ 	dict = {}
+ 
+ 	i = string.rfind(module, '.')
+ 	if i >= 0:
+ 		# Dotted module name
+ 		package = string.strip(module[:i])
+ 		submodule = string.strip(module[i+1:])
+ 		parent = readmodule(package, path, inpackage)
+ 		child = readmodule(submodule, parent['__path__'], 1)
+ 		return child
+ 
+ 	if _modules.has_key(module):
+ 		# we've seen this module before...
+ 		return _modules[module]
+ 	if module in sys.builtin_module_names:
+ 		# this is a built-in module
+ 		_modules[module] = dict
+ 		return dict
+ 
+ 	# search the path for the module
+ 	f = None
+ 	if inpackage:
+ 		try:
+ 			f, file, (suff, mode, type) = \
+ 				imp.find_module(module, path)
+ 		except ImportError:
+ 			f = None
+ 	if f is None:
+ 		fullpath = list(path) + sys.path
+ 		f, file, (suff, mode, type) = imp.find_module(module, fullpath)
+ 	if type == imp.PKG_DIRECTORY:
+ 		dict['__path__'] = [file]
+ 		_modules[module] = dict
+ 		path = [file] + path
+ 		f, file, (suff, mode, type) = \
+ 				imp.find_module('__init__', [file])
+ 	if type != imp.PY_SOURCE:
+ 		# not Python source, can't do anything with this module
+ 		f.close()
+ 		_modules[module] = dict
+ 		return dict
+ 
+ 	_modules[module] = dict
+ 	imports = []
+ 	classstack = []	# stack of (class, indent) pairs
+ 	src = f.read()
+ 	f.close()
+ 
+ 	# To avoid having to stop the regexp at each newline, instead
+ 	# when we need a line number we simply string.count the number of
+ 	# newlines in the string since the last time we did this; i.e.,
+ 	#    lineno = lineno + \
+ 	#             string.count(src, '\n', last_lineno_pos, here)
+ 	#    last_lineno_pos = here
+ 	countnl = string.count
+ 	lineno, last_lineno_pos = 1, 0
+ 	i = 0
+ 	while 1:
+ 		m = _getnext(src, i)
+ 		if not m:
+ 			break
+ 		start, i = m.span()
+ 
+ 		if m.start("Method") >= 0:
+ 			# found a method definition or function
+ 			thisindent = _indent(m.group("MethodIndent"))
+ 			meth_name = m.group("MethodName")
+ 			lineno = lineno + \
+ 				 countnl(src, '\n',
+ 					 last_lineno_pos, start)
+ 			last_lineno_pos = start
+ 			# close all classes indented at least as much
+ 			while classstack and \
+ 			      classstack[-1][1] >= thisindent:
+ 				del classstack[-1]
+ 			if classstack:
+ 				# it's a class method
+ 				cur_class = classstack[-1][0]
+ 				cur_class._addmethod(meth_name, lineno)
+ 			else:
+ 				# it's a function
+ 				f = Function(module, meth_name,
+ 					     file, lineno)
+ 				dict[meth_name] = f
+ 
+ 		elif m.start("String") >= 0:
+ 			pass
+ 
+ 		elif m.start("Class") >= 0:
+ 			# we found a class definition
+ 			thisindent = _indent(m.group("ClassIndent"))
+ 			# close all classes indented at least as much
+ 			while classstack and \
+ 			      classstack[-1][1] >= thisindent:
+ 				del classstack[-1]
+ 			lineno = lineno + \
+ 				 countnl(src, '\n', last_lineno_pos, start)
+ 			last_lineno_pos = start
+ 			class_name = m.group("ClassName")
+ 			inherit = m.group("ClassSupers")
+ 			if inherit:
+ 				# the class inherits from other classes
+ 				inherit = string.strip(inherit[1:-1])
+ 				names = []
+ 				for n in string.splitfields(inherit, ','):
+ 					n = string.strip(n)
+ 					if dict.has_key(n):
+ 						# we know this super class
+ 						n = dict[n]
+ 					else:
+ 						c = string.splitfields(n, '.')
+ 						if len(c) > 1:
+ 							# super class
+ 							# is of the
+ 							# form module.class:
+ 							# look in
+ 							# module for class
+ 							m = c[-2]
+ 							c = c[-1]
+ 							if _modules.has_key(m):
+ 								d = _modules[m]
+ 								if d.has_key(c):
+ 									n = d[c]
+ 					names.append(n)
+ 				inherit = names
+ 			# remember this class
+ 			cur_class = Class(module, class_name, inherit,
+ 					  file, lineno)
+ 			dict[class_name] = cur_class
+ 			classstack.append((cur_class, thisindent))
+ 
+ 		elif m.start("Import") >= 0:
+ 			# import module
+ 			for n in string.split(m.group("ImportList"), ','):
+ 				n = string.strip(n)
+ 				try:
+ 					# recursively read the imported module
+ 					d = readmodule(n, path, inpackage)
+ 				except:
+ 					##print 'module', n, 'not found'
+ 					pass
+ 
+ 		elif m.start("ImportFrom") >= 0:
+ 			# from module import stuff
+ 			mod = m.group("ImportFromPath")
+ 			names = string.split(m.group("ImportFromList"), ',')
+ 			try:
+ 				# recursively read the imported module
+ 				d = readmodule(mod, path, inpackage)
+ 			except:
+ 				##print 'module', mod, 'not found'
+ 				continue
+ 			# add any classes that were defined in the
+ 			# imported module to our name space if they
+ 			# were mentioned in the list
+ 			for n in names:
+ 				n = string.strip(n)
+ 				if d.has_key(n):
+ 					dict[n] = d[n]
+ 				elif n == '*':
+ 					# only add a name if not
+ 					# already there (to mimic what
+ 					# Python does internally)
+ 					# also don't add names that
+ 					# start with _
+ 					for n in d.keys():
+ 						if n[0] != '_' and \
+ 						   not dict.has_key(n):
+ 							dict[n] = d[n]
+ 		else:
+ 			assert 0, "regexp _getnext found something unexpected"
+ 
+ 	return dict
+ 
+ def _indent(ws, _expandtabs=string.expandtabs):
+ 	return len(_expandtabs(ws, TABWIDTH))



From fdrake@acm.org  Tue Feb 15 18:39:02 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 15 Feb 2000 13:39:02 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
In-Reply-To: <14505.38665.827583.106215@beluga.mojam.com>
References: <m12KVzh-000Cw3C@artcom0.artcom-gmbh.de>
 <Pine.LNX.4.10.10002141714570.7924-100000@nebula.lyra.org>
 <14505.36861.554432.428111@weyr.cnri.reston.va.us>
 <14505.38665.827583.106215@beluga.mojam.com>
Message-ID: <14505.40262.109290.196694@weyr.cnri.reston.va.us>

Skip Montanaro writes:
 > I don't think it does.  This is one of the optimizations I implemented
 > in my peephole optimizer though...

  Yeah, Jeremy just called me on it over the cube wall.  Darn, I wish
we had real walls here!  ;)
  You're right, it *should* be there.  5+.5j should be a constant as
well.


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From gstein@lyra.org  Tue Feb 15 19:00:58 2000
From: gstein@lyra.org (Greg Stein)
Date: Tue, 15 Feb 2000 11:00:58 -0800 (PST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle TODO.txt,1.11,1.12
In-Reply-To: <200002151715.MAA24003@eric.cnri.reston.va.us>
Message-ID: <Pine.LNX.4.10.10002151059010.14242-100000@nebula.lyra.org>

Note that Rational is providing a WebDAV front-end to ClearCase (through
the use of a plug-in back-end to mod_dav). Dunno if Perforce will be, tho.

-g

On Tue, 15 Feb 2000, Guido van Rossum wrote:
> Update of /projects/cvsroot/python/dist/src/Tools/idle
> In directory eric:/projects/python/develop/guido/src/Tools/idle
> 
> Modified Files:
> 	TODO.txt 
> Log Message:
> Tiny addition.
> 
> 
> Index: TODO.txt
> ===================================================================
> RCS file: /projects/cvsroot/python/dist/src/Tools/idle/TODO.txt,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -C2 -r1.11 -r1.12
> *** TODO.txt	1999/09/09 14:16:02	1.11
> --- TODO.txt	2000/02/15 17:15:36	1.12
> ***************
> *** 31,35 ****
>   - make backups when saving
>   - check file mtimes at various points
> ! - interface with RCS/CVS/Perforce ???
>   - status bar???
>   - better help?
> --- 31,35 ----
>   - make backups when saving
>   - check file mtimes at various points
> ! - Pluggable interface with RCS/CVS/Perforce/Clearcase
>   - status bar???
>   - better help?
> 
> 
> _______________________________________________
> Python-checkins mailing list
> Python-checkins@python.org
> http://www.python.org/mailman/listinfo/python-checkins
> 

-- 
Greg Stein, http://www.lyra.org/



From guido@cnri.reston.va.us  Tue Feb 15 19:11:29 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 14:11:29 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle README.txt,1.7,1.8
Message-ID: <200002151911.OAA25067@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	README.txt 
Log Message:
A bit restructured.


Index: README.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/README.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** README.txt	2000/02/15 17:16:40	1.7
--- README.txt	2000/02/15 19:11:26	1.8
***************
*** 2,27 ****
  ------------------------
  
  For news about this release, see the file NEWS.txt.  (For a more
  detailed change log, see the file ChangeLog.)
  
! This is an early release of IDLE, my own attempt at a Tkinter-based
! IDE for Python.  It has the following features:
  
! - 100% pure Python
! - multi-window text editor with multiple undo and Python colorizing
! - Python shell (a.k.a. interactive interpreter) window subclass
! - debugger (not complete, but you can set breakpoints and step)
! - works on Windows and Unix (probably works on Mac too)
! 
! The main program is in the file "idle"; on Windows you can use
! idle.pyw to avoid popping up a DOS console.  Any arguments passed are
! interpreted as files that will be opened for editing.
! 
! IDLE requires Python 1.5.2, so it is currently only usable with the
! Python 1.5.2 distribution (luckily, IDLE is bundled with Python
! 1.5.2).
  
! Please send feedback to the Python newsgroup, comp.lang.python, and cc
! me <guido@python.org>.
  
  --Guido van Rossum (home page: http://www.python.org/~guido/)
--- 2,52 ----
  ------------------------
  
+ This is an early release of IDLE, my own attempt at a Tkinter-based
+ IDE for Python.
+ 
  For news about this release, see the file NEWS.txt.  (For a more
  detailed change log, see the file ChangeLog.)
  
! FEATURES
! 
! IDLE has the following features:
! 
! - coded in 100% pure Python, using the Tkinter GUI toolkit (i.e. Tcl/Tk)
! 
! - cross-platform: works on Windows and Unix (on the Mac, there are
! currently problems with Tcl/Tk)
! 
! - multi-window text editor with multiple undo, Python colorizing
! and many other features, e.g. smart indent and call tips
! 
! - Python shell window (a.k.a. interactive interpreter)
! 
! - debugger (not complete, but you can set breakpoints, view  and step)
! 
! USAGE
! 
! The main program is in the file "idle.py"; on Unix, you should be able
! to run it by typing "./idle.py" to your shell.  On Windows, you can
! run it by double-clicking it; you can use idle.pyw to avoid popping up
! a DOS console.  If you want to pass command line arguments on Windows,
! use the batch file idle.bat.
! 
! Command line arguments: files passed on the command line are executed,
! not opened for editing, unless you give the -e command line option.
! Try "./idle.py -h" to see other command line options.
! 
! IDLE requires Python 1.5.2, so it is currently only usable with a
! Python 1.5.2 distribution.  (An older version of IDLE is distributed
! with Python 1.5.2; you can drop this version on top of it.)
! 
! COPYRIGHT
! 
! IDLE is covered by the standard Python copyright notice
! (http://www.python.org/doc/Copyright.html).
  
! FEEDBACK
  
! For feedback, please use the Python Bugs List
! (http://www.python.org/search/search_bugs.html).
  
  --Guido van Rossum (home page: http://www.python.org/~guido/)



From jhylton@cnri.reston.va.us  Tue Feb 15 21:51:01 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 16:51:01 -0500 (EST)
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_foo.py,NONE,1.1
Message-ID: <200002152151.QAA03437@bitdiddle.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory bitdiddle:/home/jhylton/python/nondist/src/Compiler/tests

Added Files:
	test_foo.py 
Log Message:
silly test case





From jhylton@cnri.reston.va.us  Tue Feb 15 21:57:17 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 16:57:17 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/lib-old Para.py,1.3,1.4
Message-ID: <200002152157.QAA03473@bitdiddle.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/lib-old
In directory bitdiddle:/home/jhylton/python/src/Lib/lib-old

Modified Files:
	Para.py 
Log Message:
no real change -- testing syncmail


Index: Para.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/lib-old/Para.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Para.py	1996/10/08 14:05:32	1.3
--- Para.py	2000/02/15 21:57:14	1.4
***************
*** 1,3 ****
! # Text formatting abstractions
  # Note -- this module is obsolete, it's too slow anyway
  
--- 1,3 ----
! # Text formatting abstractions 
  # Note -- this module is obsolete, it's too slow anyway
  



From jhylton@cnri.reston.va.us  Tue Feb 15 22:09:05 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 17:09:05 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_func.py,1.4,1.5
Message-ID: <200002152209.RAA14400@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_func.py 
Log Message:
no change -- testing syncmail







Index: test_func.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_func.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** test_func.py	2000/02/15 22:08:16	1.4
--- test_func.py	2000/02/15 22:09:02	1.5
***************
*** 15,18 ****
      print test3(None, Ellipsis, "365")
  
- 
  test()
--- 15,17 ----



From jhylton@cnri.reston.va.us  Tue Feb 15 22:10:36 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 17:10:36 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_func.py,1.5,1.6
Message-ID: <200002152210.RAA14429@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_func.py 
Log Message:
no change -- testing syncmail







Index: test_func.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_func.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** test_func.py	2000/02/15 22:09:02	1.5
--- test_func.py	2000/02/15 22:10:33	1.6
***************
*** 15,17 ****
      print test3(None, Ellipsis, "365")
  
! test()
--- 15,18 ----
      print test3(None, Ellipsis, "365")
  
! test();
! 



From jhylton@cnri.reston.va.us  Tue Feb 15 23:43:22 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 18:43:22 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/p2c transformer.py,1.5,1.6
Message-ID: <200002152343.SAA15601@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/p2c
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/p2c

Modified Files:
	transformer.py 
Log Message:
fix creation of Ellipsis node


Index: transformer.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/p2c/transformer.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** transformer.py	2000/02/15 21:30:48	1.5
--- transformer.py	2000/02/15 23:43:19	1.6
***************
*** 1022,1026 ****
      ch = node[1]
      if ch[0] == token.DOT and node[2][0] == token.DOT:
!       return ('ellipsis', None)
      if ch[0] == token.COLON or len(node) > 2:
        return self.com_sliceobj(node)
--- 1022,1026 ----
      ch = node[1]
      if ch[0] == token.DOT and node[2][0] == token.DOT:
!       return Node('ellipsis')
      if ch[0] == token.COLON or len(node) > 2:
        return self.com_sliceobj(node)



From jhylton@cnri.reston.va.us  Tue Feb 15 23:43:37 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 18:43:37 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_except.py,1.2,1.3
Message-ID: <200002152343.SAA15618@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_except.py 
Log Message:
test nested trys



Index: test_except.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_except.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** test_except.py	2000/02/15 21:49:03	1.2
--- test_except.py	2000/02/15 23:43:35	1.3
***************
*** 7,14 ****
  def foo():
      try:
!         1/0
!     except quam():
!         pass
!     raise MyException, "testing"
  
  def bar():
--- 7,22 ----
  def foo():
      try:
!         try:
!             try:
!                 1/0
!             except quam():
!                 print "zero divide"
!             except:
!                 print "uhoh"
!         finally:
!             print "whatever"
!         raise MyException, "testing"
!     finally:
!         print "last word"
  
  def bar():
***************
*** 33,38 ****
      else:
          print "what went wrong?"
  
- baz()
  
  
--- 41,50 ----
      else:
          print "what went wrong?"
+ 
+ try:
+     baz()
+ finally:
+     print "finally"
  
  
  



From jhylton@cnri.reston.va.us  Tue Feb 15 23:43:47 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 18:43:47 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_slice.py,1.1,1.2
Message-ID: <200002152343.SAA15635@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_slice.py 
Log Message:
test sliceobjs




Index: test_slice.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_slice.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** test_slice.py	2000/02/10 00:48:47	1.1
--- test_slice.py	2000/02/15 23:43:44	1.2
***************
*** 1,5 ****
  def test():
      l = range(1, 10)
!     print l[2:3]
      print l[-3:-1]
      print l[:]
--- 1,17 ----
+ class IGottaTestThis:
+     def __getitem__(self, arg):
+         print arg
+         return len(arg)
+     def __setitem__(self, loc, val):
+         print loc
+         print val
+         raise IndexError, "where exactly is that?"
+ 
  def test():
      l = range(1, 10)
!     try:
!         print l[2:3:2]
!     except TypeError:
!         print "this is a little odd"
      print l[-3:-1]
      print l[:]
***************
*** 11,13 ****
--- 23,32 ----
      print l
  
+     obj = IGottaTestThis()
+     print obj[5:10:-5, ..., 1:3:6]
+     try:
+         obj[5:10:-5, ..., 1:3:6] = 4, 5
+     except IndexError:
+         print "didn't think it would work anyway"
+     
  test()



From jhylton@cnri.reston.va.us  Tue Feb 15 23:45:29 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 18:45:29 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler compile.py,1.13,1.14
Message-ID: <200002152345.SAA15655@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	compile.py 
Log Message:
finish first impl of code generator

add support for nodes TryExcept, TryFinally, Sliceobj
fix visitSubscript to properly handle x[a,b,c]





Index: compile.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/compile.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** compile.py	2000/02/14 23:57:56	1.13
--- compile.py	2000/02/15 23:45:26	1.14
***************
*** 156,167 ****
  
  class CodeGenerator:
!     """TODO
  
-     EmptyNode
-     Sliceobj
-     Tryexcept
-     Tryfinally
-     """
- 
      OPTIMIZED = 1
  
--- 156,161 ----
  
  class CodeGenerator:
!     """Generate bytecode for the Python VM"""
  
      OPTIMIZED = 1
  
***************
*** 426,429 ****
--- 420,480 ----
          self.emit('JUMP_ABSOLUTE', l.startAnchor)
  
+     def visitTryExcept(self, node):
+         # XXX need to figure out exactly what is on the stack when an
+         # exception is raised and the first handler is checked
+         handlers = StackRef()
+         end = StackRef()
+         if node.else_:
+             lElse = StackRef()
+         else:
+             lElse = end
+         self.emit('SET_LINENO', node.lineno)
+         self.emit('SETUP_EXCEPT', handlers)
+         self.visit(node.body)
+         self.emit('POP_BLOCK')
+         self.emit('JUMP_FORWARD', lElse)
+         handlers.bind(self.code.getCurInst())
+         
+         last = len(node.handlers) - 1
+         for i in range(len(node.handlers)):
+             expr, target, body = node.handlers[i]
+             if hasattr(expr, 'lineno'):
+                 self.emit('SET_LINENO', expr.lineno)
+             if expr:
+                 self.emit('DUP_TOP')
+                 self.visit(expr)
+                 self.emit('COMPARE_OP', "exception match")
+                 next = StackRef()
+                 self.emit('JUMP_IF_FALSE', next)
+                 self.emit('POP_TOP')
+             self.emit('POP_TOP')
+             if target:
+                 self.visit(target)
+             else:
+                 self.emit('POP_TOP')
+             self.emit('POP_TOP')
+             self.visit(body)
+             self.emit('JUMP_FORWARD', end)
+             next.bind(self.code.getCurInst())
+             self.emit('POP_TOP')
+         self.emit('END_FINALLY')
+         if node.else_:
+             lElse.bind(self.code.getCurInst())
+             self.visit(node.else_)
+         end.bind(self.code.getCurInst())
+         return 1
+     
+     def visitTryFinally(self, node):
+         final = StackRef()
+         self.emit('SET_LINENO', node.lineno)
+         self.emit('SETUP_FINALLY', final)
+         self.visit(node.body)
+         self.emit('POP_BLOCK')
+         self.emit('LOAD_CONST', None)
+         final.bind(self.code.getCurInst())
+         self.visit(node.final)
+         self.emit('END_FINALLY')
+         return 1
+ 
      def visitCompare(self, node):
  	"""Comment from compile.c follows:
***************
*** 493,500 ****
      def visitSubscript(self, node):
          self.visit(node.expr)
!         for sub in node.subs[:-1]:
              self.visit(sub)
!             self.emit('BINARY_SUBSCR')
!         self.visit(node.subs[-1])
          if node.flags == 'OP_APPLY':
              self.emit('BINARY_SUBSCR')
--- 544,551 ----
      def visitSubscript(self, node):
          self.visit(node.expr)
!         for sub in node.subs:
              self.visit(sub)
!         if len(node.subs) > 1:
!             self.emit('BUILD_TUPLE', len(node.subs))
          if node.flags == 'OP_APPLY':
              self.emit('BINARY_SUBSCR')
***************
*** 503,507 ****
  	elif node.flags == 'OP_DELETE':
              self.emit('DELETE_SUBSCR')
!             
          return 1
  
--- 554,558 ----
  	elif node.flags == 'OP_DELETE':
              self.emit('DELETE_SUBSCR')
!         print
          return 1
  
***************
*** 522,527 ****
              self.emit('DELETE_SLICE+%d' % slice)
          else:
!             print node.flags
              raise
          return 1
  
--- 573,585 ----
              self.emit('DELETE_SLICE+%d' % slice)
          else:
!             print "weird slice", node.flags
              raise
+         return 1
+ 
+     def visitSliceobj(self, node):
+         for child in node.nodes:
+             print child
+             self.visit(child)
+         self.emit('BUILD_SLICE', len(node.nodes))
          return 1
  



From jhylton@cnri.reston.va.us  Wed Feb 16 00:49:51 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 19:49:51 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler misc.py,1.3,1.4
Message-ID: <200002160049.TAA16006@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	misc.py 
Log Message:
add flatten helper function


Index: misc.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/misc.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** misc.py	2000/02/10 20:54:27	1.3
--- misc.py	2000/02/16 00:49:47	1.4
***************
*** 1,2 ****
--- 1,13 ----
+ import types
+ 
+ def flatten(tup):
+     elts = []
+     for elt in tup:
+         if type(elt) == types.TupleType:
+             elts = elts + flatten(elt)
+         else:
+             elts.append(elt)
+     return elts
+ 
  class Set:
      def __init__(self):



From jhylton@cnri.reston.va.us  Wed Feb 16 00:50:31 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 19:50:31 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler pyassem.py,1.2,1.3
Message-ID: <200002160050.TAA16027@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	pyassem.py 
Log Message:
fix argcount generation for arg lists containing tuple unpacks
this is sort of a hack



Index: pyassem.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/pyassem.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pyassem.py	2000/02/15 21:59:50	1.2
--- pyassem.py	2000/02/16 00:50:29	1.3
***************
*** 54,58 ****
  	self.insts = []
          # used by makeCodeObject
!         self.argcount = len(args)
          self.code = ''
          self.consts = [docstring]
--- 54,58 ----
  	self.insts = []
          # used by makeCodeObject
!         self._getArgCount(args)
          self.code = ''
          self.consts = [docstring]
***************
*** 68,71 ****
--- 68,81 ----
          self.lnotab = ''
  
+     def _getArgCount(self, args):
+         if args and args[0][0] == '.':
+             for i in range(len(args)):
+                 if args[i][0] == '.':
+                     num = i
+             self.argcount = num + 1
+         else:
+             self.argcount = len(args)
+                 
+ 
      def __repr__(self):
          return "<bytecode: %d instrs>" % len(self.insts)
***************
*** 232,236 ****
  
      nameOps = ('STORE_NAME', 'IMPORT_NAME', 'IMPORT_FROM',
!                'STORE_ATTR', 'LOAD_ATTR', 'LOAD_NAME', 'DELETE_NAME')
      localOps = ('LOAD_FAST', 'STORE_FAST', 'DELETE_FAST')
      globalOps = ('LOAD_GLOBAL', 'STORE_GLOBAL', 'DELETE_GLOBAL')
--- 242,247 ----
  
      nameOps = ('STORE_NAME', 'IMPORT_NAME', 'IMPORT_FROM',
!                'STORE_ATTR', 'LOAD_ATTR', 'LOAD_NAME', 'DELETE_NAME',
!                'DELETE_ATTR')
      localOps = ('LOAD_FAST', 'STORE_FAST', 'DELETE_FAST')
      globalOps = ('LOAD_GLOBAL', 'STORE_GLOBAL', 'DELETE_GLOBAL')



From jhylton@cnri.reston.va.us  Wed Feb 16 00:51:40 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 19:51:40 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/p2c transformer.py,1.6,1.7
Message-ID: <200002160051.TAA16045@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/p2c
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/p2c

Modified Files:
	transformer.py 
Log Message:
more robust assignment of lineno for keyword args
get the lineno from the name of the keyword arg

example of case that didn't work--
def foo(x, y, a = None,
	b = None):




Index: transformer.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/p2c/transformer.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** transformer.py	2000/02/15 23:43:19	1.6
--- transformer.py	2000/02/16 00:51:37	1.7
***************
*** 994,1000 ****
      if n[0] != token.NAME:
        raise SyntaxError, "keyword can't be an expression (%s)"%n[0]
!     n = Node('keyword', n[1], result)
!     n.lineno = result.lineno
!     return 1, n
  
    def com_subscriptlist(self, primary, nodelist, assigning):
--- 994,1000 ----
      if n[0] != token.NAME:
        raise SyntaxError, "keyword can't be an expression (%s)"%n[0]
!     node = Node('keyword', n[1], result)
!     node.lineno = n[2]
!     return 1, node
  
    def com_subscriptlist(self, primary, nodelist, assigning):



From jhylton@cnri.reston.va.us  Wed Feb 16 00:52:06 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 19:52:06 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_func.py,1.6,1.7
Message-ID: <200002160052.TAA16065@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_func.py 
Log Message:
add example with implicit tuple unpacking for arguments




Index: test_func.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_func.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** test_func.py	2000/02/15 22:10:33	1.6
--- test_func.py	2000/02/16 00:52:04	1.7
***************
*** 10,18 ****
      return zfill(a, 10)
  
  def test():
      print test1(2)
      print test2('a', b='c', c='d', abc='42')
      print test3(None, Ellipsis, "365")
  
! test();
  
--- 10,22 ----
      return zfill(a, 10)
  
+ def test4(((a, b), c), x, (d, (e, f))):
+     return a + b * c - d / e + f
+ 
  def test():
      print test1(2)
      print test2('a', b='c', c='d', abc='42')
      print test3(None, Ellipsis, "365")
+     print test4(((10, 6), 2), 0, (6, (3, 22)))
  
! test()
  



From jhylton@cnri.reston.va.us  Wed Feb 16 00:55:46 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 19:55:46 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler compile.py,1.14,1.15
Message-ID: <200002160055.TAA16085@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	compile.py 
Log Message:
support for arglists with implicit tuple unpacks
- added a number of support methods to generate code just before the
  body 
- hack protocol for communicating number of args to PyAssembler

fix TryExcept generation for case where exception handler has no body
fix visitAssAttr
add comment about incomplete visitAssName

stop using the ExampleASTVisitor

change script invocation to accept a list of .py files (e.g. Lib/*.py)






Index: compile.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/compile.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** compile.py	2000/02/15 23:45:26	1.14
--- compile.py	2000/02/16 00:55:44	1.15
***************
*** 17,20 ****
--- 17,21 ----
  import stat
  import struct
+ import types
  
  def parse(path):
***************
*** 178,182 ****
          self.name = func.name
          self.filename = filename
!         args = func.argnames
  	self.code = PyAssembler(args=args, name=func.name,
                                   filename=filename)
--- 179,186 ----
          self.name = func.name
          self.filename = filename
! 
!         # keep a lookout for 'def foo((x,y)):'
!         args, hasTupleArg = self.generateArglist(func.argnames)
!         
  	self.code = PyAssembler(args=args, name=func.name,
                                   filename=filename)
***************
*** 189,194 ****
--- 193,231 ----
          self.locals.push(lnf.getLocals())
  	self.emit('SET_LINENO', func.lineno)
+ 	if hasTupleArg:
+             self.generateArgUnpack(func.argnames)
          walk(func.code, self)
  
+     def generateArglist(self, arglist):
+         args = []
+         extra = []
+         count = 0
+         for elt in arglist:
+             if type(elt) == types.StringType:
+                 args.append(elt)
+             elif type(elt) == types.TupleType:
+                 args.append(".nested%d" % count)
+                 count = count + 1
+                 extra.extend(misc.flatten(elt))
+             else:
+                 raise ValueError, "unexpect argument type:", elt
+         return args + extra, count
+ 
+     def generateArgUnpack(self, args):
+         count = 0
+         for arg in args:
+             if type(arg) == types.TupleType:
+                 self.emit('LOAD_FAST', '.nested%d' % count)
+                 count = count + 1
+                 self.unpackTuple(arg)
+                         
+     def unpackTuple(self, tup):
+         self.emit('UNPACK_TUPLE', len(tup))
+         for elt in tup:
+             if type(elt) == types.TupleType:
+                 self.unpackTuple(elt)
+             else:
+                 self.emit('STORE_FAST', elt)
+ 
      def generateFunctionCode(self, func):
          """Generate code for a function body"""
***************
*** 392,396 ****
              lElse = l.breakAnchor
          l.startAnchor.bind(self.code.getCurInst())
!         self.emit('SET_LINENO', node.test.lineno)
          self.visit(node.test)
          self.emit('JUMP_IF_FALSE', lElse)
--- 429,434 ----
              lElse = l.breakAnchor
          l.startAnchor.bind(self.code.getCurInst())
!         if hasattr(node.test, 'lineno'):
!             self.emit('SET_LINENO', node.test.lineno)
          self.visit(node.test)
          self.emit('JUMP_IF_FALSE', lElse)
***************
*** 456,460 ****
              self.visit(body)
              self.emit('JUMP_FORWARD', end)
!             next.bind(self.code.getCurInst())
              self.emit('POP_TOP')
          self.emit('END_FINALLY')
--- 494,499 ----
              self.visit(body)
              self.emit('JUMP_FORWARD', end)
!             if expr:
!                 next.bind(self.code.getCurInst())
              self.emit('POP_TOP')
          self.emit('END_FINALLY')
***************
*** 554,558 ****
  	elif node.flags == 'OP_DELETE':
              self.emit('DELETE_SUBSCR')
-         print
          return 1
  
--- 593,596 ----
***************
*** 597,600 ****
--- 635,639 ----
  
      def visitAssName(self, node):
+         # XXX handle OP_DELETE
          if node.flags != 'OP_ASSIGN':
              print "oops", node.flags
***************
*** 602,610 ****
  
      def visitAssAttr(self, node):
!         if node.flags != 'OP_ASSIGN':
              print "warning: unexpected flags:", node.flags
              print node
-         self.visit(node.expr)
-         self.emit('STORE_ATTR', node.attrname)
          return 1
  
--- 641,652 ----
  
      def visitAssAttr(self, node):
!         self.visit(node.expr)
!         if node.flags == 'OP_ASSIGN':
!             self.emit('STORE_ATTR', node.attrname)
!         elif node.flags == 'OP_DELETE':
!             self.emit('DELETE_ATTR', node.attrname)
!         else:
              print "warning: unexpected flags:", node.flags
              print node
          return 1
  
***************
*** 866,870 ****
          self.ast = t.parsesuite(self.source)
          cg = CodeGenerator(self.filename)
!         walk(self.ast, cg, walker=ExampleASTVisitor)
          self.code = cg.asConst()
  
--- 908,912 ----
          self.ast = t.parsesuite(self.source)
          cg = CodeGenerator(self.filename)
!         walk(self.ast, cg)
          self.code = cg.asConst()
  
***************
*** 889,905 ****
      import getopt
  
      opts, args = getopt.getopt(sys.argv[1:], 'vq')
      for k, v in opts:
          if k == '-v':
              ASTVisitor.VERBOSE = ASTVisitor.VERBOSE + 1
          if k == '-q':
              f = open('/dev/null', 'wb')
              sys.stdout = f
!     if args:
!         filename = args[0]
      else:
!         filename = 'test.py'
!     buf = open(filename).read()
!     mod = CompiledModule(buf, filename)
!     mod.compile()
!     mod.dump(filename + 'c')
--- 931,951 ----
      import getopt
  
+     VERBOSE = 0
      opts, args = getopt.getopt(sys.argv[1:], 'vq')
      for k, v in opts:
          if k == '-v':
+             VERBOSE = 1
              ASTVisitor.VERBOSE = ASTVisitor.VERBOSE + 1
          if k == '-q':
              f = open('/dev/null', 'wb')
              sys.stdout = f
!     if not args:
!         print "no files to compile"
      else:
!         for filename in args:
!             if VERBOSE:
!                 print filename
!             buf = open(filename).read()
!             mod = CompiledModule(buf, filename)
!             mod.compile()
!             mod.dump(filename + 'c')



From guido@cnri.reston.va.us  Wed Feb 16 01:22:38 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 20:22:38 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle NEWS.txt,1.6,1.7
Message-ID: <200002160122.UAA26947@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	NEWS.txt 
Log Message:
The 0.5 release happened on 2/15, not on 2/14. :-)


Index: NEWS.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/NEWS.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** NEWS.txt	2000/02/15 18:20:28	1.6
--- NEWS.txt	2000/02/16 01:22:35	1.7
***************
*** 3,7 ****
  ----------------------------------------------------------------------
  
! New in IDLE 0.5 (2/14/2000)
  -------------------------
  
--- 3,7 ----
  ----------------------------------------------------------------------
  
! New in IDLE 0.5 (2/15/2000)
  -------------------------
  



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 15:15:44 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 10:15:44 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14.4.1,1.14.4.2
Message-ID: <200002161515.KAA24418@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libcrypt.tex 
Log Message:

Latest round of changes from Peter Funk <pf@artcom-gmbh.de>.

Moved all authoring attributions to the markup; none remain in the
text.  Permission received from both authors.


Index: libcrypt.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libcrypt.tex,v
retrieving revision 1.14.4.1
retrieving revision 1.14.4.2
diff -C2 -r1.14.4.1 -r1.14.4.2
*** libcrypt.tex	2000/02/14 22:17:08	1.14.4.1
--- libcrypt.tex	2000/02/16 15:15:41	1.14.4.2
***************
*** 8,11 ****
--- 8,12 ----
  \moduleauthor{Steven D. Majewski}{sdm7g@virginia.edu}
  \sectionauthor{Steven D. Majewski}{sdm7g@virginia.edu}
+ \sectionauthor{Peter Funk}{pf@artcom-gmbh.de}
  
  
***************
*** 18,28 ****
  
  \begin{funcdesc}{crypt}{word, salt} 
! \var{word} will usually be a user's password as typed at a prompt or
! in a graphical interface.  \var{salt} is usually a random
! two-character string which will be used to perturb the DES algorithm
! in one of 4096 ways.  The characters in \var{salt} must be in the set
! \regexp{[./a-zA-Z0-9]}.  Returns the hashed password as a string,
! which will be composed of characters from the same alphabet as the
! salt (the first two characters represent the salt itself).
  \end{funcdesc}
  
--- 19,29 ----
  
  \begin{funcdesc}{crypt}{word, salt} 
!   \var{word} will usually be a user's password as typed at a prompt or 
!   in a graphical interface.  \var{salt} is usually a random
!   two-character string which will be used to perturb the DES algorithm
!   in one of 4096 ways.  The characters in \var{salt} must be in the
!   set \regexp{[./a-zA-Z0-9]}.  Returns the hashed password as a
!   string, which will be composed of characters from the same alphabet
!    as the salt (the first two characters represent the salt itself).
  \end{funcdesc}
  
***************
*** 32,35 ****
--- 33,37 ----
  \begin{verbatim}
  import crypt, getpass, pwd
+ 
  def login():
      username = raw_input('Python login:')
***************
*** 39,45 ****
              raise "Sorry, currently no support for shadow passwords"
          cleartext = getpass.getpass()
!         return crypt(cleartext, cryptedpasswd[0:2]) == cryptedpasswd
  \end{verbatim}
- 
- The module and documentation were written by Steve Majewski.
- \index{Majewski, Steve}
--- 41,46 ----
              raise "Sorry, currently no support for shadow passwords"
          cleartext = getpass.getpass()
!         return crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
!     else:
!         return 1
  \end{verbatim}



From pf@artcom-gmbh.de  Wed Feb 16 15:28:56 2000
From: pf@artcom-gmbh.de (Peter Funk)
Date: Wed, 16 Feb 2000 16:28:56 +0100 (MET)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14.4.1,1.14.4.2
In-Reply-To: <200002161515.KAA24418@weyr.cnri.reston.va.us> from "Fred L. Drake" at "Feb 16, 2000 10:15:44 am"
Message-ID: <m12L6Ns-000Cw4C@artcom0.artcom-gmbh.de>

Hi!

Fred L. Drake:
[...]
> Latest round of changes from Peter Funk <pf@artcom-gmbh.de>.
[...]

You didn't apply the patch using the patch program but edited 
it manually?  Unfortunately you missed a small detail, which Fredrik
pointed out before.  I submitted the following patch (shortened here):

pf> *** ../../../Python-CVS_15_02_00-orig/dist/src/Doc/lib/libcrypt.tex     Tue Feb 
pf> --- Doc/lib/libcrypt.tex        Tue Feb 15 11:59:46 2000
[...]
pf>  import crypt, getpass, pwd
[...]
pf> !         return crypt(cleartext, cryptedpasswd[0:2]) == cryptedpasswd
[...]
pf> !         return crypt.crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
---------------------^^^^^^!

This is why I find unified context diffs far more superior than these old
style context diffs.  In unified context diffs such small changes don't
escape your eyes so easy, since old and new lines come directly after
each other.

[...]
> retrieving revision 1.14.4.2
> diff -C2 -r1.14.4.1 -r1.14.4.2
> *** libcrypt.tex	2000/02/14 22:17:08	1.14.4.1
> --- libcrypt.tex	2000/02/16 15:15:41	1.14.4.2
[...]
> ***************
> *** 39,45 ****
[...]
> !         return crypt(cleartext, cryptedpasswd[0:2]) == cryptedpasswd
>   \end{verbatim}
[...]
> !         return crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
> !     else:
> !         return 1
>   \end{verbatim}
[...]

Sorry for the nitpicking:  But I wanted to keep Fredrik satisfied.

Please let me know, if I can do anything on the content and format
of my patches to simplify the task of automatically applying them
to the CVS.  

For the time being I will try submit patches that fullfill
the following formal conditions:
 1. contain a small argument, why I believe the patch should be applied,
    atmost 3-4 lines of text;  
 2. contain the standard disclaimer;
 3. contain my signature;
 4. and contain finally the patch as an ancient style context diff relative to
    the dist/src subdirectory from a rather recent CVS tarball.

Regards, Peter
-- 
Peter Funk, Oldenburger Str.86, 27777 Ganderkesee, Tel: 04222 9502 70, Fax: -60


From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 16:07:46 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 11:07:46 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.8,1.56.2.9
Message-ID: <200002161607.LAA24839@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p1/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Buffer interface documentation from Greg Stein <gstein@lyra.org>;
thanks!


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.8
retrieving revision 1.56.2.9
diff -C2 -r1.56.2.8 -r1.56.2.9
*** api.tex	2000/02/03 18:23:34	1.56.2.8
--- api.tex	2000/02/16 16:07:43	1.56.2.9
***************
*** 1852,1858 ****
  
  \subsection{Buffer Objects \label{bufferObjects}}
  
! XXX need a real description of buffers and buffer ''segments.``
  
  \begin{cvardesc}{PyTypeObject}{PyBuffer_Type}
  The instance of \ctype{PyTypeObject} which represents the Python
--- 1852,1897 ----
  
  \subsection{Buffer Objects \label{bufferObjects}}
+ \sectionauthor{Greg Stein}{gstein@lyra.org}
  
! Python type objects can export a group of functions called the
! ``buffer interface.'' These functions can be used by an object to
! expose its data in a raw, byte-oriented format. Clients of the object
! can use the buffer interface to access the object data directly,
! without needing to copy it first.
! 
! Two examples of objects that support 
! the buffer interface are strings and arrays. The string object exposes 
! the character contents in the buffer interface's byte-oriented
! form. An array can also expose its contents, but it should be noted
! that array elements may be multi-byte values.
! 
! An example user of the buffer interface is the file object's
! \method{write()} method. Any object that can export a series of bytes
! through the buffer interface can be written to a file. There are a
! number of format codes to \cfunction{PyArgs_ParseTuple()} that operate 
! against an object's buffer interface, returning data from the target
! object.
! 
! More information on the buffer interface is provided in the section
! \ref{newTypes}, under the description for \ctype{PyBufferProcs}.
  
+ A ``buffer object'' is defined in the \file{bufferobject.h} header
+ (included by \file{Python.h}). These objects look very similar to
+ string objects at the Python programming level: they support slicing,
+ indexing, concatenation, and some other standard string
+ operations. However, their data can come from one of two sources: from
+ a block of memory, or from another object which exports the buffer
+ interface.
+ 
+ Buffer objects are useful as a way to expose the data from another
+ object's buffer interface to the Python programmer. They can also be
+ used as a zero-copy slicing mechanism. Using their ability to
+ reference a block of memory, it is possible to expose any data to the
+ Python programmer quite easily. The memory could be a large, constant
+ array in a C extension, it could be a raw block of memory for
+ manipulation before passing to an operating system library, or it
+ could be used to pass around structured data in its native, in-memory
+ format.
+ 
  \begin{cvardesc}{PyTypeObject}{PyBuffer_Type}
  The instance of \ctype{PyTypeObject} which represents the Python
***************
*** 1861,1865 ****
  
  \begin{cvardesc}{int}{Py_END_OF_BUFFER}
! Constant returned by \cfunction{Py}
  \end{cvardesc}
  
--- 1900,1910 ----
  
  \begin{cvardesc}{int}{Py_END_OF_BUFFER}
! This constant may be passed as the \var{size} parameter to
! \cfunction{PyBuffer_FromObject()} or
! \cfunction{PyBuffer_FromReadWriteObject()}. It indicates that the new
! \ctype{PyBufferObject} should refer to \var{base} object from the
! specified \var{offset} to the end of its exported buffer. Using this
! enables the caller to avoid querying the \var{base} object for its
! length.
  \end{cvardesc}
  
***************
*** 1870,1878 ****
  \begin{cfuncdesc}{PyObject*}{PyBuffer_FromObject}{PyObject *base,
                                                    int offset, int size}
! Return a new read-only buffer object.
! Raises \exception{TypeError} if \var{base} doesn't support the
! read-only buffer protocol or doesn't provide exactly one buffer
! segment.  Raises \exception{ValueError} if \var{offset} is less than
! zero.
  \end{cfuncdesc}
  
--- 1915,1928 ----
  \begin{cfuncdesc}{PyObject*}{PyBuffer_FromObject}{PyObject *base,
                                                    int offset, int size}
! Return a new read-only buffer object.  This raises
! \exception{TypeError} if \var{base} doesn't support the read-only
! buffer protocol or doesn't provide exactly one buffer segment, or it
! raises \exception{ValueError} if \var{offset} is less than zero. The
! buffer will hold a reference to the \var{base} object, and the
! buffer's contents will refer to the \var{base} object's buffer
! interface, starting as position \var{offset} and extending for
! \var{size} bytes. If \var{size} is \constant{Py_END_OF_BUFFER}, then
! the new buffer's contents extend to the length of the \var{base}
! object's exported buffer data.
  \end{cfuncdesc}
  
***************
*** 1882,1906 ****
  Return a new writable buffer object.  Parameters and exceptions are
  similar to those for \cfunction{PyBuffer_FromObject()}.
  \end{cfuncdesc}
  
  \begin{cfuncdesc}{PyObject*}{PyBuffer_FromMemory}{void *ptr, int size}
! Return a new read-only buffer object that reads from a memory buffer.
  The caller is responsible for ensuring that the memory buffer, passed
  in as \var{ptr}, is not deallocated while the returned buffer object
  exists.  Raises \exception{ValueError} if \var{size} is less than
  zero.
  \end{cfuncdesc}
  
  \begin{cfuncdesc}{PyObject*}{PyBuffer_FromReadWriteMemory}{void *ptr, int size}
! Return a new writable buffer object that reads from and writes to a
! memory buffer.  The caller is responsible for ensuring that the memory
! buffer, passed in as \var{ptr}, is not deallocated while the returned
! buffer object exists.  Raises \exception{ValueError} if \var{size} is
! less than zero.
  \end{cfuncdesc}
  
  \begin{cfuncdesc}{PyObject*}{PyBuffer_New}{int size}
  Returns a new writable buffer object that maintains its own memory
! buffer of \var{size} bytes.  \var{size} must be zero or positive.
  \end{cfuncdesc}
  
--- 1932,1961 ----
  Return a new writable buffer object.  Parameters and exceptions are
  similar to those for \cfunction{PyBuffer_FromObject()}.
+ 
+ If the \var{base} object does not export the writeable buffer
+ protocol, then \exception{TypeError} is raised.
  \end{cfuncdesc}
  
  \begin{cfuncdesc}{PyObject*}{PyBuffer_FromMemory}{void *ptr, int size}
! Return a new read-only buffer object that reads from a specified
! location in memory, with a specified size.
  The caller is responsible for ensuring that the memory buffer, passed
  in as \var{ptr}, is not deallocated while the returned buffer object
  exists.  Raises \exception{ValueError} if \var{size} is less than
  zero.
+ 
+ Note that \constant{Py_END_OF_BUFFER} may \emph{not} be passed for the
+ \var{size} parameter.
  \end{cfuncdesc}
  
  \begin{cfuncdesc}{PyObject*}{PyBuffer_FromReadWriteMemory}{void *ptr, int size}
! Similar to \cfunction{PyBuffer_FromMemory()}, but the returned buffer
! is writable.
  \end{cfuncdesc}
  
  \begin{cfuncdesc}{PyObject*}{PyBuffer_New}{int size}
  Returns a new writable buffer object that maintains its own memory
! buffer of \var{size} bytes.  \exception{ValueError} is returned if
! \var{size} is not zero or positive.
  \end{cfuncdesc}
  
***************
*** 2572,2577 ****
  extension is imported after the interpreter has been completely
  re-initialized by calling \cfunction{Py_Finalize()} and
! \cfunction{Py_Initialize()}; in that case, the extension's \code{init}
! function \emph{is} called again.
  
  \strong{Bugs and caveats:} Because sub-interpreters (and the main 
--- 2627,2632 ----
  extension is imported after the interpreter has been completely
  re-initialized by calling \cfunction{Py_Finalize()} and
! \cfunction{Py_Initialize()}; in that case, the extension's
! \code{init\var{module}} function \emph{is} called again.
  
  \strong{Bugs and caveats:} Because sub-interpreters (and the main 
***************
*** 3107,3114 ****
  unaryfunc, binaryfunc, ternaryfunc, inquiry, coercion, intargfunc,
  intintargfunc, intobjargproc, intintobjargproc, objobjargproc,
- getreadbufferproc, getsegcountproc, getcharbufferproc,
  destructor, printfunc, getattrfunc, getattrofunc, setattrfunc,
  setattrofunc, cmpfunc, reprfunc, hashfunc
  
  \begin{ctypedesc}{int (*getwritebufferproc) (PyObject *self, int segment,
                                               void **ptrptr)}
--- 3162,3172 ----
  unaryfunc, binaryfunc, ternaryfunc, inquiry, coercion, intargfunc,
  intintargfunc, intobjargproc, intintobjargproc, objobjargproc,
  destructor, printfunc, getattrfunc, getattrofunc, setattrfunc,
  setattrofunc, cmpfunc, reprfunc, hashfunc
  
+ \begin{ctypedesc}{int (*getreadbufferproc) (PyObject *self, int segment,
+                                             void **ptrptr)}
+ \end{ctypedesc}
+ 
  \begin{ctypedesc}{int (*getwritebufferproc) (PyObject *self, int segment,
                                               void **ptrptr)}
***************
*** 3120,3125 ****
--- 3178,3193 ----
  \var{segment} specifies a segment that doesn't exist.
  % Why doesn't it raise ValueError for this one?
+ % GJS: because you shouldn't be calling it with an invalid
+ %      segment. That indicates a blatant programming error in the C
+ %      code.
+ \end{ctypedesc}
+ 
+ \begin{ctypedesc}{int (*getsegcountproc) (PyObject *self, int *lenp)}
  \end{ctypedesc}
  
+ \begin{ctypedesc}{int (*getcharbufferproc) (PyObject *self, int segment,
+                                             const char **ptrptr)}
+ \end{ctypedesc}
+ 
  PyNumberMethods
  
***************
*** 3127,3132 ****
  
  PyMappingMethods
  
! PyBufferProcs
  
  PyTypeObject
--- 3195,3268 ----
  
  PyMappingMethods
+ 
+ \begin{ctypedesc}{PyBufferProcs}
+ \code{PyBufferProcs} defines a set of slots for a Python type
+ object. These slots are used to implement the ``buffer interface.''
+ 
+ The buffer interface exports a model where an object can expose its
+ internal data as a set of chunks of data, each chunk specified as a
+ pointer/length pair. These chunks are called
+ ``segments'' and are presumed to be non-contiguous in memory.
+ 
+ If an object does not export the buffer interface, then its
+ \member{tp_as_buffer} member in the \ctype{PyTypeObject} structure
+ should be \NULL{}. Otherwise, \member{tp_as_buffer} will point to a
+ \ctype{PyBufferProcs} structure.
+ 
+ \emph{Note:} it is very important that your \ctype{PyTypeObject}
+ structure uses \code{Py_TPFLAGS_DEFAULT} for the value of the
+ \member{tp_flags} member. This tells the Python runtime that your
+ \ctype{PyBufferProcs} structure contains the \member{bf_getcharbuffer} 
+ slot. Older versions of Python did not have this member, so a new
+ Python interpreter using an old extension needs to be able to test for 
+ its presence before using it.
+ 
+ The first slot in the \ctype{PyBufferProcs} structure is
+ \member{bf_getreadbuffer}, which has type
+ \ctype{getreadbufferproc}. If this slot is \NULL{}, then the object does
+ not support reading from the internal data. This is non-sensical, so
+ implementors should fill this in. The read-buffer function is allowed
+ to raise an exception and return \code{-1}. Callers should test for
+ \NULL{} before using the slot and should check for an exception. The
+ \var{segment} which is passed must be zero or positive, and strictly less
+ than the number of segments returned by the \member{bf_getsegcount}
+ slot function.
+ 
+ The next slot is \member{bf_getwritebuffer} having type
+ \ctype{getwritebufferproc}. This slot may be \NULL{} if the object
+ does not allow writing into its returned buffers. If the slot function 
+ is present, it is allowed to raise an exception and return \code{-1}.
+ The \var{segment} follows the same restrictions as for
+ \member{bf_getreadbuffer}.
+ 
+ The third slot is \member{bf_getsegcount}, with type
+ \ctype{getsegcountproc}. This slot must not be \NULL{} and is used to
+ inform the caller how many segments the object contains. Simple
+ objects such as \ctype{PyString_Type} and \ctype{PyBuffer_Type}
+ objects contain a single segment. The \var{lenp} parameter may be
+ \NULL{}. If not, then the implementation should store the total size of all 
+ buffer segments into \code{*lenp}.
+ 
+ The last slot is \member{bf_getcharbuffer}, which has type
+ \ctype{getcharbufferproc}. This slot will only be present if the
+ \code{Py_TPFLAGS_HAVE_GETCHARBUFFER} flag is present in
+ \member{tp_flags} of the object's \ctype{PyTypeObject}. Before using
+ this slot, the caller should test whether it is present by using the
+ \cfunction{PyType_HasFeature()} macro. Assuming the slot is present,
+ then it may be \NULL{} indicating that the object's contents cannot be 
+ used a \emph{8-bit characters}. The slot function may also raise an
+ error if the object's contents cannot be interpreted as 8-bit
+ characters. For example, if the object is an array 
+ which is configured to hold floating point values, an exception may be 
+ raised if a caller attempts to use \member{bf_getcharbuffer} to fetch
+ a sequence of 8-bit characters. This notion of exporting the internal
+ buffers as ``text'' is used to distinguish between objects that are
+ binary in nature, and those which have character-based content.
+ 
+ \emph{Note:} the current policy seems to state that these
+ characters may be multi-byte characters. This implies that a buffer
+ size of \var{N} does not mean there are \var{N} characters present.
  
! \end{ctypedesc}
  
  PyTypeObject



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 16:21:29 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 11:21:29 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14.4.2,1.14.4.3
Message-ID: <200002161621.LAA24991@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libcrypt.tex 
Log Message:

Oops, I mis-applied the patch from Peter with my visual application
technique!  ;)  This gets the last bit in.


Index: libcrypt.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libcrypt.tex,v
retrieving revision 1.14.4.2
retrieving revision 1.14.4.3
diff -C2 -r1.14.4.2 -r1.14.4.3
*** libcrypt.tex	2000/02/16 15:15:41	1.14.4.2
--- libcrypt.tex	2000/02/16 16:21:27	1.14.4.3
***************
*** 41,45 ****
              raise "Sorry, currently no support for shadow passwords"
          cleartext = getpass.getpass()
!         return crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
      else:
          return 1
--- 41,45 ----
              raise "Sorry, currently no support for shadow passwords"
          cleartext = getpass.getpass()
!         return crypt.crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
      else:
          return 1



From fdrake@acm.org  Wed Feb 16 16:24:52 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Wed, 16 Feb 2000 11:24:52 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14.4.1,1.14.4.2
In-Reply-To: <m12L6Ns-000Cw4C@artcom0.artcom-gmbh.de>
References: <200002161515.KAA24418@weyr.cnri.reston.va.us>
 <m12L6Ns-000Cw4C@artcom0.artcom-gmbh.de>
Message-ID: <14506.53076.191605.445978@weyr.cnri.reston.va.us>

Peter Funk writes:
 > You didn't apply the patch using the patch program but edited 
 > it manually?  Unfortunately you missed a small detail, which Fredrik
 > pointed out before.  I submitted the following patch (shortened here):

  Actually, I usually apply small patches manually, mostly because
it's easier than saving to a file and applying it.  I'm sure I could
come up with an XEmacs shortcut, but that requires digging even
further into elisp.  ;(

 > pf> !         return crypt.crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
 > ---------------------^^^^^^!

  Ok, ok.... fixed in CVS now.

 > Sorry for the nitpicking:  But I wanted to keep Fredrik satisfied.

  Please don't be!  This is what makes Python's docs good.

 > Please let me know, if I can do anything on the content and format
 > of my patches to simplify the task of automatically applying them
 > to the CVS.  

  No need to change, and the unidiffs are fine.  The problem here was
wetware, not software.  ;)


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 17:14:01 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 12:14:01 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/perl python.perl,1.65.2.3,1.65.2.4
Message-ID: <200002161714.MAA25735@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/perl
In directory weyr:/home/fdrake/projects/python/Doc-152p1/perl

Modified Files:
      Tag: release152p1-patches
	python.perl 
Log Message:

Work over the table support a little; this gets the 'r' column
specifier right (previously not properly handled for data cells in
tables, header cells were fine).

get_th():  Removed.

figure_column_alignment():  New function; converts a latex table
        column specifier to the appropriate 'align="foo"' value
        suitable for use in <th> and <td> start tags.  (get_th() was
        specific to <th>.)

setup_column_alignments():  Adjusted to use figure_column_alignment()
        instead of get_th().

do_cmd_lineii(),
do_cmd_lineiii(),
do_cmd_lineiv():  If the first cell is right-aligned, add a trailing
        non-breaking space for padding.  This improves readability
        when the first column is right-aligned and the second column
        is left-aligned.

do_env_tableii(),
do_env_tableiii(),
do_env_tableiv():  But don't overdo the first-column padding in the
        header cells.


Index: python.perl
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.65.2.3
retrieving revision 1.65.2.4
diff -C2 -r1.65.2.3 -r1.65.2.4
*** python.perl	2000/02/01 19:06:40	1.65.2.3
--- python.perl	2000/02/16 17:13:58	1.65.2.4
***************
*** 869,886 ****
  $TABLE_HEADER_BGCOLOR = $NAV_BGCOLOR;
  
- sub get_th{
-     my $a = @_[0];
-     my $r = '<th>';
-     if ($a eq 'l')
-       { $r = '<th align="left">'; }
-     elsif (substr($a, 0, 1) eq 'p')
-       { $r = '<th align="left">'; }
-     elsif ($a eq 'r')
-       { $r = '<th align="right">'; }
-     elsif ($a eq 'c')
-       { $r = '<th align="center">'; }
-     return $r;
- }
- 
  sub fix_font{
      # do a little magic on a font name to get the right behavior in the first
--- 869,872 ----
***************
*** 899,913 ****
  }
  
  sub setup_column_alignments{
      local($_) = @_;
!     my($a1,$a2,$a3,$a4) = split(/[|]/,$_);
!     my($th1,$th2,$th3,$th4) = ('<th>', '<th>', '<th>', '<th>');
!     $col_aligns[0] = (($a1 eq 'c') ? '<td align="center" valign="baseline">'
! 		                   : '<td valign="baseline">');
!     $col_aligns[1] = (($a2 eq 'c') ? '<td align="center">' : '<td>');
!     $col_aligns[2] = (($a3 eq 'c') ? '<td align="center">' : '<td>');
!     $col_aligns[3] = (($a4 eq 'c') ? '<td align="center">' : '<td>');
      # return the aligned header start tags
!     return (get_th($a1), get_th($a2), get_th($a3), get_th($a4));
  }
  
--- 885,916 ----
  }
  
+ sub figure_column_alignment{
+     my $a = @_[0];
+     my $mark = substr($a, 0, 1);
+     my $r = '';
+     if ($mark eq 'c')
+       { $r = ' align="center"'; }
+     elsif ($mark eq 'r')
+       { $r = ' align="right" '; }
+     elsif ($mark eq 'l')
+       { $r = ' align="left"  '; }
+     elsif ($mark eq 'p')
+       { $r = ' align="left"  '; }
+     return $r;
+ }
+ 
  sub setup_column_alignments{
      local($_) = @_;
!     my($s1,$s2,$s3,$s4) = split(/[|]/,$_);
!     my $a1 = figure_column_alignment($s1);
!     my $a2 = figure_column_alignment($s2);
!     my $a3 = figure_column_alignment($s3);
!     my $a4 = figure_column_alignment($s4);
!     $col_aligns[0] = "<td$a1 valign=\"baseline\">";
!     $col_aligns[1] = "<td$a2>";
!     $col_aligns[2] = "<td$a3>";
!     $col_aligns[3] = "<td$a4>";
      # return the aligned header start tags
!     return ("<th$a1>", "<th$a2>", "<th$a3>", "<th$a4>");
  }
  
***************
*** 934,939 ****
             . "\n  <thead>"
             . "\n    <tr$TABLE_HEADER_BGCOLOR>"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;\&nbsp;</th>"
  	   . "\n    </thead>"
  	   . "\n  <tbody valign='baseline'>"
--- 937,942 ----
             . "\n  <thead>"
             . "\n    <tr$TABLE_HEADER_BGCOLOR>"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;</th>"
  	   . "\n    </thead>"
  	   . "\n  <tbody valign='baseline'>"
***************
*** 951,955 ****
      $c2 = '&nbsp;' if ($c2 eq '');
      my($c1align,$c2align) = @col_aligns[0,1];
!     return "\n    <tr>$c1align$sfont$c1$efont</td>\n"
             . "        $c2align$c2</td>"
  	   . $_;
--- 954,962 ----
      $c2 = '&nbsp;' if ($c2 eq '');
      my($c1align,$c2align) = @col_aligns[0,1];
!     my $padding = '';
!     if ($c1align =~ /align="right"/) {
!         $padding = '&nbsp;';
!     }
!     return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>"
  	   . $_;
***************
*** 968,974 ****
             . "\n  <thead>"
             . "\n    <tr$TABLE_HEADER_BGCOLOR>"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;\&nbsp;</th>"
! 	   . "\n      $th3<b>$h3</b>\&nbsp;\&nbsp;</th>"
  	   . "\n    </thead>"
  	   . "\n  <tbody valign='baseline'>"
--- 975,981 ----
             . "\n  <thead>"
             . "\n    <tr$TABLE_HEADER_BGCOLOR>"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;</th>"
! 	   . "\n      $th3<b>$h3</b>\&nbsp;</th>"
  	   . "\n    </thead>"
  	   . "\n  <tbody valign='baseline'>"
***************
*** 987,991 ****
      $c3 = '&nbsp;' if ($c3 eq '');
      my($c1align,$c2align,$c3align) = @col_aligns[0,1,2];
!     return "\n    <tr>$c1align$sfont$c1$efont</td>\n"
             . "        $c2align$c2</td>\n"
  	   . "        $c3align$c3</td>"
--- 994,1002 ----
      $c3 = '&nbsp;' if ($c3 eq '');
      my($c1align,$c2align,$c3align) = @col_aligns[0,1,2];
!     my $padding = '';
!     if ($c1align =~ /align="right"/) {
!         $padding = '&nbsp;';
!     }
!     return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>\n"
  	   . "        $c3align$c3</td>"
***************
*** 1006,1013 ****
             . "\n  <thead>"
             . "\n    <tr$TABLE_HEADER_BGCOLOR>"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;\&nbsp;</th>"
! 	   . "\n      $th3<b>$h3</b>\&nbsp;\&nbsp;</th>"
! 	   . "\n      $th4<b>$h4</b>\&nbsp;\&nbsp;</th>"
  	   . "\n    </thead>"
  	   . "\n  <tbody valign='baseline'>"
--- 1017,1024 ----
             . "\n  <thead>"
             . "\n    <tr$TABLE_HEADER_BGCOLOR>"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;</th>"
! 	   . "\n      $th3<b>$h3</b>\&nbsp;</th>"
! 	   . "\n      $th4<b>$h4</b>\&nbsp;</th>"
  	   . "\n    </thead>"
  	   . "\n  <tbody valign='baseline'>"
***************
*** 1027,1031 ****
      $c4 = '&nbsp;' if ($c4 eq '');
      my($c1align,$c2align,$c3align,$c4align) = @col_aligns;
!     return "\n    <tr>$c1align$sfont$c1$efont</td>\n"
             . "        $c2align$c2</td>\n"
  	   . "        $c3align$c3</td>\n"
--- 1038,1046 ----
      $c4 = '&nbsp;' if ($c4 eq '');
      my($c1align,$c2align,$c3align,$c4align) = @col_aligns;
!     my $padding = '';
!     if ($c1align =~ /align="right"/) {
!         $padding = '&nbsp;';
!     }
!     return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>\n"
  	   . "        $c3align$c3</td>\n"



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 17:17:03 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 12:17:03 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libgrp.tex,1.13,1.13.4.1 libpwd.tex,1.11,1.11.4.1
Message-ID: <200002161717.MAA25774@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libgrp.tex libpwd.tex 
Log Message:

Improved descriptions and added cross-references from Peter Funk
<pf@artcom-gmbh.de>.  Includes limited markup changes by FLD.


Index: libgrp.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libgrp.tex,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -C2 -r1.13 -r1.13.4.1
*** libgrp.tex	1999/03/02 17:03:37	1.13
--- libgrp.tex	2000/02/16 17:16:59	1.13.4.1
***************
*** 12,19 ****
  Group database entries are reported as 4-tuples containing the
  following items from the group database (see \code{<grp.h>}), in order:
! \code{gr_name},
! \code{gr_passwd},
! \code{gr_gid},
! \code{gr_mem}.
  The gid is an integer, name and password are strings, and the member
  list is a list of strings.
--- 12,23 ----
  Group database entries are reported as 4-tuples containing the
  following items from the group database (see \code{<grp.h>}), in order:
! 
! \begin{tableiii}{r|l|l}{textrm}{Index}{Field}{Meaning}
!   \lineiii{0}{gr_name}{the name of the group}
!   \lineiii{1}{gr_passwd}{the (encrypted) group password; often empty}
!   \lineiii{2}{gr_gid}{the numerical group ID}
!   \lineiii{3}{gr_mem}{all the group member's  user  names}
! \end{tableiii}
! 
  The gid is an integer, name and password are strings, and the member
  list is a list of strings.
***************
*** 35,36 ****
--- 39,45 ----
  Return a list of all available group entries, in arbitrary order.
  \end{funcdesc}
+ 
+ 
+ \begin{seealso}
+   \seemodule{pwd}{An interface to the user database, similar to this.}
+ \end{seealso}

Index: libpwd.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libpwd.tex,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -C2 -r1.11 -r1.11.4.1
*** libpwd.tex	1999/03/02 17:03:39	1.11
--- libpwd.tex	2000/02/16 17:17:00	1.11.4.1
***************
*** 6,24 ****
  \modulesynopsis{The password database (\function{getpwnam()} and friends).}
  
! This module provides access to the \UNIX{} password database.
! It is available on all \UNIX{} versions.
  
  Password database entries are reported as 7-tuples containing the
  following items from the password database (see \code{<pwd.h>}), in order:
! \code{pw_name},
! \code{pw_passwd},
! \code{pw_uid},
! \code{pw_gid},
! \code{pw_gecos},
! \code{pw_dir},
! \code{pw_shell}.
  The uid and gid items are integers, all others are strings.
  \exception{KeyError} is raised if the entry asked for cannot be found.
  
  It defines the following items:
  
--- 6,36 ----
  \modulesynopsis{The password database (\function{getpwnam()} and friends).}
  
! This module provides access to the \UNIX{} user account and password
! database.  It is available on all \UNIX{} versions.
  
  Password database entries are reported as 7-tuples containing the
  following items from the password database (see \code{<pwd.h>}), in order:
! 
! \begin{tableiii}{r|l|l}{textrm}{Index}{Field}{Meaning}
!   \lineiii{0}{\code{pw_name}}{Login name}
!   \lineiii{1}{\code{pw_passwd}}{Optional encrypted password}
!   \lineiii{2}{\code{pw_uid}}{Numerical user ID}
!   \lineiii{3}{\code{pw_gid}}{Numerical group ID}
!   \lineiii{4}{\code{pw_gecos}}{User name or comment field}
!   \lineiii{5}{\code{pw_dir}}{User home directory}
!   \lineiii{6}{\code{pw_shell}}{User command interpreter}
! \end{tableiii}
! 
  The uid and gid items are integers, all others are strings.
  \exception{KeyError} is raised if the entry asked for cannot be found.
  
+ \strong{Note:} In traditional \UNIX{} the field \code{pw_passwd} usually
+ contains a password encrypted with a DES derived algorithm (see module
+ \refmodule{crypt}\refbimodindex{crypt}).  However most modern unices 
+ use a so-called \emph{shadow password} system.  On those unices the
+ field \code{pw_passwd} only contains a asterisk (\code{'*'}) or the 
+ letter \character{x} where the encrypted password is stored in a file
+ \file{/etc/shadow} which is not world readable.
+ 
  It defines the following items:
  
***************
*** 34,35 ****
--- 46,52 ----
  Return a list of all available password database entries, in arbitrary order.
  \end{funcdesc}
+ 
+ 
+ \begin{seealso}
+   \seemodule{grp}{An interface to the group database, similar to this.}
+ \end{seealso}



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 17:25:43 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 12:25:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/ext ext.tex,1.68.2.5,1.68.2.6
Message-ID: <200002161725.MAA25883@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/ext
In directory weyr:/home/fdrake/projects/python/Doc-152p1/ext

Modified Files:
      Tag: release152p1-patches
	ext.tex 
Log Message:

Revised link to old "dynamic linking" chapter to the much-changed
document structure.  Thanks to Peter Funk <pf@artcom-gmbh.de>.

Slight changes to markup.


Index: ext.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/ext/ext.tex,v
retrieving revision 1.68.2.5
retrieving revision 1.68.2.6
diff -C2 -r1.68.2.5 -r1.68.2.6
*** ext.tex	2000/01/18 22:36:19	1.68.2.5
--- ext.tex	2000/02/16 17:25:40	1.68.2.6
***************
*** 455,460 ****
  compiling and linking it with the Python system.  If you use dynamic
  loading, the details depend on the style of dynamic loading your
! system uses; see the chapter ``Dynamic Loading'' for more information
! about this.
  
  If you can't use dynamic loading, or if you want to make your module a
--- 455,462 ----
  compiling and linking it with the Python system.  If you use dynamic
  loading, the details depend on the style of dynamic loading your
! system uses; see the chapters about building extension modules on
! \UNIX{} (chapter \ref{building-on-unix}) and Windows (chapter
! \ref{building-on-windows}) for more information about this.
! % XXX Add information about MacOS  
  
  If you can't use dynamic loading, or if you want to make your module a



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 18:47:00 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 13:47:00 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/paper-letter Makefile,1.12,1.12.4.1
Message-ID: <200002161847.NAA26145@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/paper-letter
In directory weyr:/home/fdrake/projects/python/Doc-152p1/paper-letter

Modified Files:
      Tag: release152p1-patches
	Makefile 
Log Message:

The README file depends on the ../tools/getpagecounts script.


Index: Makefile
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/paper-letter/Makefile,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -C2 -r1.12 -r1.12.4.1
*** Makefile	1999/04/14 14:04:39	1.12
--- Makefile	2000/02/16 18:46:57	1.12.4.1
***************
*** 76,80 ****
  
  
! README:	$(PSFILES)
  	$(TOOLSDIR)/getpagecounts >$@
  
--- 76,80 ----
  
  
! README:	$(PSFILES) $(TOOLSDIR)/getpagecounts
  	$(TOOLSDIR)/getpagecounts >$@
  



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 18:49:47 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 13:49:47 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools mkhowto,1.4,1.4.4.1
Message-ID: <200002161849.NAA26198@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tools
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tools

Modified Files:
      Tag: release152p1-patches
	mkhowto 
Log Message:

Be a little more helpful in case LaTeX2HTML ever gets updated (at
least one user tried a newer version).


Index: mkhowto
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tools/mkhowto,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** mkhowto	1999/05/06 19:37:38	1.4
--- mkhowto	2000/02/16 18:49:45	1.4.4.1
***************
*** 304,307 ****
--- 304,309 ----
              texfile = texfile[2:]
          # build the command line and run LaTeX2HTML:
+         if not os.path.isdir(builddir):
+             os.mkdir(builddir)
          args = [LATEX2HTML_BINARY,
                  "-init_file", L2H_INIT_FILE,



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 18:48:18 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 13:48:18 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools getpagecounts,1.5,1.5.2.1
Message-ID: <200002161848.NAA26175@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tools
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tools

Modified Files:
      Tag: release152p1-patches
	getpagecounts 
Log Message:

Point to the PSA Bookstore and suggest support for the PSA &
Consortium.


Index: getpagecounts
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tools/getpagecounts,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** getpagecounts	1999/08/03 17:54:39	1.5
--- getpagecounts	2000/02/16 18:48:15	1.5.2.1
***************
*** 4,8 ****
  """Generate a page count report of the PostScript version of the manuals."""
  
! __version__ = '$Revision: 1.5 $'
  
  
--- 4,8 ----
  """Generate a page count report of the PostScript version of the manuals."""
  
! __version__ = '$Revision: 1.5.2.1 $'
  
  
***************
*** 44,48 ****
  This is the PostScript version of the standard Python documentation.
  If you plan to print this, be aware that some of the documents are
! long.  The following manuals are included:
  """
      SUFFIX = """\
--- 44,55 ----
  This is the PostScript version of the standard Python documentation.
  If you plan to print this, be aware that some of the documents are
! long.  It is formatted for printing on two-sided paper; if you do plan
! to print this, *please* print two-sided if you have a printer capable
! of it!  To locate published copies of the larger manuals, or other
! Python reference material, consult the PSA Online Bookstore at:
! 
!              http://www.python.org/psa/bookstore/
! 
! The following manuals are included:
  """
      SUFFIX = """\
***************
*** 51,54 ****
--- 58,67 ----
  If you have any questions, comments, or suggestions regarding these
  documents, please send them via email to python-docs@python.org.
+ 
+ If you would like to support the development and maintenance of
+ documentation for Python, please consider joining the Python Software
+ Activity (PSA; see http://www.python.org/psa/), or urging your
+ organization to join the PSA or the Python Consortium (see
+ http://www.python.org/consortium/).
  """
  



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 18:50:12 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 13:50:12 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools mkhtml.sh,1.10,1.10.4.1
Message-ID: <200002161850.NAA26221@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tools
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tools

Modified Files:
      Tag: release152p1-patches
	mkhtml.sh 
Log Message:

Be a little more helpful in case LaTeX2HTML ever gets updated (at
least one user tried a newer version).


Index: mkhtml.sh
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tools/mkhtml.sh,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -C2 -r1.10 -r1.10.4.1
*** mkhtml.sh	1999/05/03 14:27:45	1.10
--- mkhtml.sh	2000/02/16 18:50:09	1.10.4.1
***************
*** 28,31 ****
--- 28,33 ----
  if [ -d $part ] ; then
      rm -f $part/*.html
+ else
+     mkdir $part
  fi
  



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 18:53:51 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 13:53:51 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc Makefile,1.190,1.190.2.1
Message-ID: <200002161853.NAA26266@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	Makefile 
Log Message:

Use the right compression tools for each package!

Make sure the PNG icons always get bundled as well.


Index: Makefile
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/Makefile,v
retrieving revision 1.190
retrieving revision 1.190.2.1
diff -C2 -r1.190 -r1.190.2.1
*** Makefile	1999/08/02 20:20:14	1.190
--- Makefile	2000/02/16 18:53:49	1.190.2.1
***************
*** 233,241 ****
  postscript-$(PAPER)-$(RELEASE).tar.bz2: ps
  	(cd paper-$(PAPER); $(MAKE) README)
! 	(cd paper-$(PAPER); tar cf - *.ps README) | gzip -9 >$@
  
  postscript-$(PAPER)-$(RELEASE).tgz: ps
  	(cd paper-$(PAPER); $(MAKE) README)
! 	(cd paper-$(PAPER); tar cf - *.ps README) | bzip2 -9 >$@
  
  postscript-$(PAPER)-$(RELEASE).zip: ps
--- 233,241 ----
  postscript-$(PAPER)-$(RELEASE).tar.bz2: ps
  	(cd paper-$(PAPER); $(MAKE) README)
! 	(cd paper-$(PAPER); tar cf - *.ps README) | bzip2 -9 >$@
  
  postscript-$(PAPER)-$(RELEASE).tgz: ps
  	(cd paper-$(PAPER); $(MAKE) README)
! 	(cd paper-$(PAPER); tar cf - *.ps README) | gzip -9 >$@
  
  postscript-$(PAPER)-$(RELEASE).zip: ps
***************
*** 244,256 ****
  
  html-$(RELEASE).tgz:	html
! 	(cd $(HTMLDIR); tar cf - *index.html ???/*.css ???/*.html */*.gif) \
  		| gzip -9 >$@
  
  html-$(RELEASE).tar.bz2:	html
! 	(cd $(HTMLDIR); tar cf - *index.html ???/*.css ???/*.html */*.gif) \
  		| bzip2 -9 >$@
  
  html-$(RELEASE).zip:	html
! 	(cd $(HTMLDIR); zip -9 ../$@ *index.html ???/*.css ???/*.html */*.gif)
  
  # convenience targets:
--- 244,259 ----
  
  html-$(RELEASE).tgz:	html
! 	(cd $(HTMLDIR); \
! 		tar cf - *index.html ???/*.css ???/*.html */*.gif */*.png) \
  		| gzip -9 >$@
  
  html-$(RELEASE).tar.bz2:	html
! 	(cd $(HTMLDIR); \
! 		tar cf - *index.html ???/*.css ???/*.html */*.gif */*.png) \
  		| bzip2 -9 >$@
  
  html-$(RELEASE).zip:	html
! 	(cd $(HTMLDIR); \
! 		zip -9 ../$@ *index.html ???/*.css ???/*.html */*.gif */*.png)
  
  # convenience targets:



From guido@cnri.reston.va.us  Wed Feb 16 21:11:55 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 16 Feb 2000 16:11:55 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules binascii.c,2.17,2.18
Message-ID: <200002162111.QAA29345@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/src/Modules

Modified Files:
	binascii.c 
Log Message:
Patch by Jim Ahlstrom to add crc32, a useful checksum function
(e.g. used for ZIP files).

The patch includes code that says:
+  Copyright (C) 1986 Gary S. Brown.  You may use this program, or
+  code or tables extracted from it, as desired without restriction.

My interpretation (and Jim's) is that Gary S Brown has no claims under
copyright, patent or other rights or interests.  Lawyers might disagree.


Index: binascii.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/binascii.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** binascii.c	1999/10/19 19:05:14	2.17
--- binascii.c	2000/02/16 21:11:52	2.18
***************
*** 773,776 ****
--- 773,916 ----
  }
  
+ static char doc_crc32[] =
+ "(data, oldcrc = 0) -> newcrc. Compute CRC-32 incrementally";
+ 
+ /*  Crc - 32 BIT ANSI X3.66 CRC checksum files
+     Also known as: ISO 3307
+ **********************************************************************|
+ *                                                                    *|
+ * Demonstration program to compute the 32-bit CRC used as the frame  *|
+ * check sequence in ADCCP (ANSI X3.66, also known as FIPS PUB 71     *|
+ * and FED-STD-1003, the U.S. versions of CCITT's X.25 link-level     *|
+ * protocol).  The 32-bit FCS was added via the Federal Register,     *|
+ * 1 June 1982, p.23798.  I presume but don't know for certain that   *|
+ * this polynomial is or will be included in CCITT V.41, which        *|
+ * defines the 16-bit CRC (often called CRC-CCITT) polynomial.  FIPS  *|
+ * PUB 78 says that the 32-bit FCS reduces otherwise undetected       *|
+ * errors by a factor of 10^-5 over 16-bit FCS.                       *|
+ *                                                                    *|
+ **********************************************************************|
+ 
+  Copyright (C) 1986 Gary S. Brown.  You may use this program, or
+  code or tables extracted from it, as desired without restriction.
+  
+  First, the polynomial itself and its table of feedback terms.  The  
+  polynomial is                                                       
+  X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 
+  Note that we take it "backwards" and put the highest-order term in  
+  the lowest-order bit.  The X^32 term is "implied"; the LSB is the   
+  X^31 term, etc.  The X^0 term (usually shown as "+1") results in    
+  the MSB being 1.                                                    
+ 
+  Note that the usual hardware shift register implementation, which   
+  is what we're using (we're merely optimizing it by doing eight-bit  
+  chunks at a time) shifts bits into the lowest-order term.  In our   
+  implementation, that means shifting towards the right.  Why do we   
+  do it this way?  Because the calculated CRC must be transmitted in  
+  order from highest-order term to lowest-order term.  UARTs transmit 
+  characters in order from LSB to MSB.  By storing the CRC this way,  
+  we hand it to the UART in the order low-byte to high-byte; the UART 
+  sends each low-bit to hight-bit; and the result is transmission bit 
+  by bit from highest- to lowest-order term without requiring any bit 
+  shuffling on our part.  Reception works similarly.                  
+ 
+  The feedback terms table consists of 256, 32-bit entries.  Notes:   
+                                                                      
+   1. The table can be generated at runtime if desired; code to do so 
+      is shown later.  It might not be obvious, but the feedback      
+      terms simply represent the results of eight shift/xor opera-    
+      tions for all combinations of data and CRC register values.     
+                                                                      
+   2. The CRC accumulation logic is the same for all CRC polynomials, 
+      be they sixteen or thirty-two bits wide.  You simply choose the 
+      appropriate table.  Alternatively, because the table can be     
+      generated at runtime, you can start by generating the table for 
+      the polynomial in question and use exactly the same "updcrc",   
+      if your application needn't simultaneously handle two CRC       
+      polynomials.  (Note, however, that XMODEM is strange.)          
+                                                                      
+   3. For 16-bit CRCs, the table entries need be only 16 bits wide;   
+      of course, 32-bit entries work OK if the high 16 bits are zero. 
+                                                                      
+   4. The values must be right-shifted by eight bits by the "updcrc"  
+      logic; the shift must be unsigned (bring in zeroes).  On some   
+      hardware you could probably optimize the shift in assembler by  
+      using byte-swap instructions.                                   
+ ********************************************************************/
+ 
+ static unsigned long crc_32_tab[256] = {
+ 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
+ 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
+ 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
+ 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
+ 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
+ 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
+ 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
+ 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
+ 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
+ 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
+ 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
+ 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
+ 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
+ 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
+ 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
+ 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
+ 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
+ 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
+ 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
+ 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
+ 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
+ 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
+ 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
+ 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
+ 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
+ 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
+ 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
+ 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
+ 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
+ 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
+ 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
+ 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
+ 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
+ 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
+ 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
+ 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
+ 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
+ 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
+ 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
+ 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
+ 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
+ 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
+ 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
+ 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
+ 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
+ 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
+ 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
+ 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
+ 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
+ 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
+ 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
+ 0x2d02ef8dUL
+ };
+ 
+ static PyObject *
+ binascii_crc32(self, args)
+ 	PyObject *self;
+ 	PyObject *args;
+ { /* By Jim Ahlstrom; All rights transferred to CNRI */
+ 	unsigned char *bin_data;
+ 	unsigned long crc = 0UL;	/* initial value of CRC */
+ 	int len;
+ 	
+ 	if ( !PyArg_ParseTuple(args, "s#|l", &bin_data, &len, &crc) )
+ 		return NULL;
+ 
+ 	crc = crc ^ 0xFFFFFFFFUL;
+ 	while(len--)
+ 		crc = crc_32_tab[(crc ^ *bin_data++) & 0xffUL] ^ (crc >> 8);
+ 		/* Note:  (crc >> 8) MUST zero fill on left */
+ 	return Py_BuildValue("l", crc ^ 0xFFFFFFFFUL);
+ }
+ 
  /* List of functions defined in the module */
  
***************
*** 789,792 ****
--- 929,933 ----
  	 doc_rledecode_hqx},
  	{"crc_hqx",		binascii_crc_hqx,	1,	doc_crc_hqx},
+ 	{"crc32",		binascii_crc32,		1,	doc_crc32},
  	{NULL,			NULL}		/* sentinel */
  };



From guido@cnri.reston.va.us  Wed Feb 16 21:13:08 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 16 Feb 2000 16:13:08 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_binascii.py,1.4,1.5
Message-ID: <200002162113.QAA29398@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/test
In directory eric:/projects/python/develop/guido/src/Lib/test

Modified Files:
	test_binascii.py 
Log Message:
Added test for new crc32() function.


Index: test_binascii.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/test/test_binascii.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** test_binascii.py	1999/10/19 19:08:13	1.4
--- test_binascii.py	2000/02/16 21:13:06	1.5
***************
*** 85,87 ****
--- 85,93 ----
  assert res == testdata
  
+ # Test crc32()
+ crc = binascii.crc32("Test the CRC-32 of")
+ crc = binascii.crc32(" this string.", crc)
+ if crc != 1571220330:
+     print "binascii.crc32() failed."
+ 
  # The hqx test is in test_binhex.py



From guido@cnri.reston.va.us  Wed Feb 16 21:13:39 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 16 Feb 2000 16:13:39 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libbinascii.tex,1.15,1.16
Message-ID: <200002162113.QAA29419@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory eric:/projects/python/develop/guido/Doc/lib

Modified Files:
	libbinascii.tex 
Log Message:
Added docs for new crc32() function.  By Jim Ahlstrom.

(Fred, please check.)


Index: libbinascii.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libbinascii.tex,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** libbinascii.tex	1999/04/23 15:42:36	1.15
--- libbinascii.tex	2000/02/16 21:13:37	1.16
***************
*** 72,75 ****
--- 72,87 ----
  \var{crc} and returning the result.
  \end{funcdesc}
+ 
+ \begin{funcdesc}{crc32}{data\optional{, crc}}
+ Compute CRC-32, the 32-bit checksum of data, starting with an initial
+ crc.  This is consistent with the ZIP file checksum.  Use as follows:
+ \begin{verbatim}
+     print binascii.crc32("hello world")
+     # Or, in two pieces:
+     crc = binascii.crc32("hello")
+     crc = binascii.crc32(" world", crc)
+     print crc
+ \end{verbatim}
+ \end{funcdesc}
   
  \begin{excdesc}{Error}



From guido@cnri.reston.va.us  Thu Feb 17 15:12:03 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 17 Feb 2000 10:12:03 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib exceptions.py,1.16,1.17
Message-ID: <200002171512.KAA00602@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	exceptions.py 
Log Message:
Added WindowsError, for Mark Hammond's extensions.


Index: exceptions.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/exceptions.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** exceptions.py	1999/08/19 21:17:08	1.16
--- exceptions.py	2000/02/17 15:12:01	1.17
***************
*** 34,37 ****
--- 34,39 ----
        |    +-- IOError
        |    +-- OSError(*)
+       |         |
+       |         +-- WindowsError(*)
        |
        +-- EOFError
***************
*** 138,141 ****
--- 140,147 ----
  class OSError(EnvironmentError):
      """OS system call failed."""
+     pass
+ 
+ class WindowsError(OSError):
+     """MS-Windows OS system call failed."""
      pass
  



From guido@cnri.reston.va.us  Thu Feb 17 15:17:21 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 17 Feb 2000 10:17:21 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Include pyerrors.h,2.33,2.34
Message-ID: <200002171517.KAA00812@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Include
In directory eric:/projects/python/develop/guido/src/Include

Modified Files:
	pyerrors.h 
Log Message:
Declarations related to new WindowsError exception.


Index: pyerrors.h
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Include/pyerrors.h,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -r2.33 -r2.34
*** pyerrors.h	1999/06/22 14:46:42	2.33
--- pyerrors.h	2000/02/17 15:17:18	2.34
***************
*** 82,85 ****
--- 82,88 ----
  extern DL_IMPORT(PyObject *) PyExc_ValueError;
  extern DL_IMPORT(PyObject *) PyExc_ZeroDivisionError;
+ #ifdef MS_WINDOWS
+ extern DL_IMPORT(PyObject *) PyExc_WindowsError;
+ #endif
  
  extern DL_IMPORT(PyObject *) PyExc_MemoryErrorInst;
***************
*** 93,96 ****
--- 96,103 ----
  extern DL_IMPORT(PyObject *) PyErr_SetFromErrnoWithFilename Py_PROTO((PyObject *, char *));
  extern DL_IMPORT(PyObject *) PyErr_Format Py_PROTO((PyObject *, const char *, ...));
+ #ifdef MS_WINDOWS
+ extern DL_IMPORT(PyObject *) PyErr_SetFromWindowsErrWithFilename(int, const char *);
+ extern DL_IMPORT(PyObject *) PyErr_SetFromWindowsErr(int);
+ #endif
  
  extern DL_IMPORT(void) PyErr_BadInternalCall Py_PROTO((void));



From guido@cnri.reston.va.us  Thu Feb 17 15:18:13 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 17 Feb 2000 10:18:13 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python bltinmodule.c,2.147,2.148
Message-ID: <200002171518.KAA00853@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory eric:/projects/python/develop/guido/src/Python

Modified Files:
	bltinmodule.c 
Log Message:
Changes by Mark Hammond related to the new WindowsError exception.


Index: bltinmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.147
retrieving revision 2.148
diff -C2 -r2.147 -r2.148
*** bltinmodule.c	1999/12/23 14:16:55	2.147
--- bltinmodule.c	2000/02/17 15:18:10	2.148
***************
*** 2263,2266 ****
--- 2263,2269 ----
  PyObject *PyExc_ValueError;
  PyObject *PyExc_ZeroDivisionError;
+ #ifdef MS_WINDOWS
+ PyObject *PyExc_WindowsError;
+ #endif
  
  PyObject *PyExc_MemoryErrorInst;
***************
*** 2304,2307 ****
--- 2307,2313 ----
  	{"TypeError",          &PyExc_TypeError,          1},
  	{"ValueError",         &PyExc_ValueError,         1},
+ #ifdef MS_WINDOWS
+ 	{"WindowsError",       &PyExc_WindowsError,       1},
+ #endif
  	{"ZeroDivisionError",  &PyExc_ZeroDivisionError,  1},
  	{NULL, NULL}



From guido@cnri.reston.va.us  Thu Feb 17 15:19:18 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 17 Feb 2000 10:19:18 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python errors.c,2.41,2.42
Message-ID: <200002171519.KAA00878@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory eric:/projects/python/develop/guido/src/Python

Modified Files:
	errors.c 
Log Message:
Patch by Mark Hammond:

* Changes to a recent patch by Chris Tismer to errors.c.  Chris' patch
always used FormatMessage() to get the error message passing the error code
from errno - but errno and FormatMessage use a different numbering scheme.
The main reason the patch looked OK was that ENOFILE==ERROR_FILE_NOT_FOUND -
but that is about the only shared error code :-).  The MS CRT docs tell you
to use _sys_errlist()/_sys_nerr.  My patch does also this, and adds a very
similar function specifically for win32 error codes.


Index: errors.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/errors.c,v
retrieving revision 2.41
retrieving revision 2.42
diff -C2 -r2.41 -r2.42
*** errors.c	1999/04/21 15:27:31	2.41
--- errors.c	2000/02/17 15:19:15	2.42
***************
*** 290,293 ****
--- 290,296 ----
  	char *s;
  	int i = errno;
+ #ifdef MS_WIN32
+ 	char *s_buf = NULL;
+ #endif
  #ifdef EINTR
  	if (i == EINTR && PyErr_CheckSignals())
***************
*** 301,318 ****
  #else
  	{
! 		int len = FormatMessage(
! 			FORMAT_MESSAGE_ALLOCATE_BUFFER |
! 			FORMAT_MESSAGE_FROM_SYSTEM |
! 			FORMAT_MESSAGE_IGNORE_INSERTS,
! 			NULL,	/* no message source */
! 			i,
! 			MAKELANGID(LANG_NEUTRAL,
! 				   SUBLANG_DEFAULT), /* Default language */
! 			(LPTSTR) &s,
! 			0,	/* size not used */
! 			NULL);	/* no args */
! 		/* remove trailing cr/lf and dots */
! 		while (len > 0 && s[len-1] <= '.')
! 			s[--len] = '\0';
  	}
  #endif
--- 304,333 ----
  #else
  	{
! 		/* Note that the Win32 errors do not lineup with the
! 		   errno error.  So if the error is in the MSVC error
! 		   table, we use it, otherwise we assume it really _is_ 
! 		   a Win32 error code
! 		*/
! 		if (i < _sys_nerr) {
! 			s = _sys_errlist[i];
! 		}
! 		else {
! 			int len = FormatMessage(
! 				FORMAT_MESSAGE_ALLOCATE_BUFFER |
! 				FORMAT_MESSAGE_FROM_SYSTEM |
! 				FORMAT_MESSAGE_IGNORE_INSERTS,
! 				NULL,	/* no message source */
! 				i,
! 				MAKELANGID(LANG_NEUTRAL,
! 					   SUBLANG_DEFAULT),
! 				           /* Default language */
! 				(LPTSTR) &s_buf,
! 				0,	/* size not used */
! 				NULL);	/* no args */
! 			s = s_buf;
! 			/* remove trailing cr/lf and dots */
! 			while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.'))
! 				s[--len] = '\0';
! 		}
  	}
  #endif
***************
*** 326,330 ****
  	}
  #ifdef MS_WIN32
! 	LocalFree(s);
  #endif
  	return NULL;
--- 341,345 ----
  	}
  #ifdef MS_WIN32
! 	LocalFree(s_buf);
  #endif
  	return NULL;
***************
*** 338,341 ****
--- 353,401 ----
  	return PyErr_SetFromErrnoWithFilename(exc, NULL);
  }
+ 
+ #ifdef MS_WINDOWS 
+ /* Windows specific error code handling */
+ PyObject *PyErr_SetFromWindowsErrWithFilename(
+ 	int ierr, 
+ 	const char *filename)
+ {
+ 	int len;
+ 	char *s;
+ 	PyObject *v;
+ 	DWORD err = (DWORD)ierr;
+ 	if (err==0) err = GetLastError();
+ 	len = FormatMessage(
+ 		/* Error API error */
+ 		FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ 		FORMAT_MESSAGE_FROM_SYSTEM |
+ 		FORMAT_MESSAGE_IGNORE_INSERTS,
+ 		NULL,	/* no message source */
+ 		err,
+ 		MAKELANGID(LANG_NEUTRAL,
+ 		SUBLANG_DEFAULT), /* Default language */
+ 		(LPTSTR) &s,
+ 		0,	/* size not used */
+ 		NULL);	/* no args */
+ 	/* remove trailing cr/lf and dots */
+ 	while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.'))
+ 		s[--len] = '\0';
+ 	if (filename != NULL && Py_UseClassExceptionsFlag)
+ 		v = Py_BuildValue("(iss)", err, s, filename);
+ 	else
+ 		v = Py_BuildValue("(is)", err, s);
+ 	if (v != NULL) {
+ 		PyErr_SetObject(PyExc_EnvironmentError, v);
+ 		Py_DECREF(v);
+ 	}
+ 	LocalFree(s);
+ 	return NULL;
+ }
+ 
+ PyObject *PyErr_SetFromWindowsErr(int ierr)
+ {
+ 	return PyErr_SetFromWindowsErrWithFilename(ierr, NULL);
+ 
+ }
+ #endif /* MS_WINDOWS */
  
  void



From guido@cnri.reston.va.us  Thu Feb 17 16:14:19 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 17 Feb 2000 11:14:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle EditorWindow.py,1.29,1.30
Message-ID: <200002171614.LAA01105@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	EditorWindow.py 
Log Message:
Add primitive customization of window size and font.
A few alternative selections can be made by changing "if 0" to "if 1".


Index: EditorWindow.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/EditorWindow.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** EditorWindow.py	2000/02/15 18:05:15	1.29
--- EditorWindow.py	2000/02/17 16:14:16	1.30
***************
*** 10,13 ****
--- 10,30 ----
  import WindowList
  
+ # Customization of default window size and font
+ # standard
+ WIDTH = 80
+ HEIGHT = 24
+ if sys.platform[:3] == 'win':
+     FONT = ("courier new", 10)
+ else:
+     FONT = ("courier", 10)
+ if 0:
+     # for demos (on Windows)
+     WIDTH = 70
+     HEIGHT = 16
+     FONT = ("lucida console", 14)
+ if 0:
+     # for Windows 98
+     FONT = ("lucida console", 8)
+ 
  # The default tab setting for a Text widget, in average-width characters.
  TK_TABWIDTH_DEFAULT = 8
***************
*** 110,113 ****
--- 127,131 ----
                                  highlightbackground=cprefs.CHilite[1],
                                  insertbackground=cprefs.CCursor[1],
+                                 width=WIDTH, height=HEIGHT,
                                  wrap="none")
  
***************
*** 139,145 ****
  
          text['yscrollcommand'] = vbar.set
!         if sys.platform[:3] == 'win':
!             text['font'] = ("lucida console", 8)
! #            text['font'] = ("courier new", 10)
          text_frame.pack(side=LEFT, fill=BOTH, expand=1)
          text.pack(side=TOP, fill=BOTH, expand=1)
--- 157,161 ----
  
          text['yscrollcommand'] = vbar.set
!         text['font'] = FONT
          text_frame.pack(side=LEFT, fill=BOTH, expand=1)
          text.pack(side=TOP, fill=BOTH, expand=1)



From guido@cnri.reston.va.us  Thu Feb 17 17:12:42 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 17 Feb 2000 12:12:42 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib imaplib.py,1.14,1.15
Message-ID: <200002171712.MAA01255@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	imaplib.py 
Log Message:
Patches by Piers Lauder.

Reasons for patches:

1st patch (15,21):
	version change

2nd patch (66,72):
	This is a patch I found in a Zope product release (quite by accident!).
	It relaxes the conditions for matching a literal. I've looked over the
	logic, and tested it, and it seems sensible.

3rd patch (117,123):
	It appears the quoting matcher was too general, and that the IMAP4
	protocol requires characters like ':' in commands to be unquoted.
	(This is the patch already sent to Guido.)

4th patch (699,705):
	Spelling correction in comment.

5th patch (753,761):
	Another patch from the Zope product. It seems that some IMAP4 servers
	produce unexpected responses in the middle of valid command/response
	sequences. This patch ignores the unexpected responses in this
	situation. (How I wish users would send me bug reports with examples!).

last 2 patches: (1015,1028) (1038,1044):
	Minor improvements to test code.


Index: imaplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imaplib.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** imaplib.py	1999/12/13 23:27:45	1.14
--- imaplib.py	2000/02/17 17:12:39	1.15
***************
*** 16,20 ****
  """
  
! __version__ = "2.16"
  
  import binascii, re, socket, string, time, random, sys
--- 16,20 ----
  """
  
! __version__ = "2.30"
  
  import binascii, re, socket, string, time, random, sys
***************
*** 67,71 ****
  	r' (?P<zonen>[-+])(?P<zoneh>[0-9][0-9])(?P<zonem>[0-9][0-9])'
  	r'"')
! Literal = re.compile(r'(?P<data>.*) {(?P<size>\d+)}$')
  Response_code = re.compile(r'\[(?P<type>[A-Z-]+)( (?P<data>[^\]]*))?\]')
  Untagged_response = re.compile(r'\* (?P<type>[A-Z-]+)( (?P<data>.*))?')
--- 67,71 ----
  	r' (?P<zonen>[-+])(?P<zoneh>[0-9][0-9])(?P<zonem>[0-9][0-9])'
  	r'"')
! Literal = re.compile(r'.*{(?P<size>\d+)}$')
  Response_code = re.compile(r'\[(?P<type>[A-Z-]+)( (?P<data>[^\]]*))?\]')
  Untagged_response = re.compile(r'\* (?P<type>[A-Z-]+)( (?P<data>.*))?')
***************
*** 118,122 ****
  	class readonly(abort): pass	# Mailbox status changed to READ-ONLY
  
! 	mustquote = re.compile(r'\W')	# Match any non-alphanumeric character
  
  	def __init__(self, host = '', port = IMAP4_PORT):
--- 118,122 ----
  	class readonly(abort): pass	# Mailbox status changed to READ-ONLY
  
! 	mustquote = re.compile(r"[^\w!#$%&'*+,.:;<=>?^`|~-]")
  
  	def __init__(self, host = '', port = IMAP4_PORT):
***************
*** 700,704 ****
  
  			if self.mo is None:
! 				# Only other possibility is '+' (continuation) rsponse...
  
  				if self._match(Continuation, resp):
--- 700,704 ----
  
  			if self.mo is None:
! 				# Only other possibility is '+' (continuation) response...
  
  				if self._match(Continuation, resp):
***************
*** 754,760 ****
  				del self.tagged_commands[tag]
  				return result
- 			self._get_response()
  
  
  	def _get_line(self):
  
--- 754,772 ----
  				del self.tagged_commands[tag]
  				return result
  
+ 			# Some have reported "unexpected response" exceptions.
+ 			# (Isn't this non-IMAP4-compliant behaviour?
+ 			# Please mail me details printed below!)
+ 			# Anyway, ignore them here.
  
+ 			try:
+ 				self._get_response()
+ 			except self.abort, val:
+ 				if __debug__:
+ 					if self.debug >= 1:
+ 						_mesg('abort exception ignored: %s' % val)
+ 						print_log()
+ 
+ 
  	def _get_line(self):
  
***************
*** 1016,1021 ****
  
  	USER = getpass.getuser()
! 	PASSWD = getpass.getpass("IMAP password for %s: " % (host or "localhost"))
  
  	test_seq1 = (
  	('login', (USER, PASSWD)),
--- 1028,1034 ----
  
  	USER = getpass.getuser()
! 	PASSWD = getpass.getpass("IMAP password for %s on %s" % (USER, host or "localhost"))
  
+ 	test_mesg = 'From: %s@localhost\nSubject: IMAP4 test\n\ndata...\n' % USER
  	test_seq1 = (
  	('login', (USER, PASSWD)),
***************
*** 1023,1027 ****
  	('rename', ('/tmp/xxx 1', '/tmp/yyy')),
  	('CREATE', ('/tmp/yyz 2',)),
! 	('append', ('/tmp/yyz 2', None, None, 'From: anon@x.y.z\n\ndata...')),
  	('list', ('/tmp', 'yy*')),
  	('select', ('/tmp/yyz 2',)),
--- 1036,1040 ----
  	('rename', ('/tmp/xxx 1', '/tmp/yyy')),
  	('CREATE', ('/tmp/yyz 2',)),
! 	('append', ('/tmp/yyz 2', None, None, test_mesg)),
  	('list', ('/tmp', 'yy*')),
  	('select', ('/tmp/yyz 2',)),
***************
*** 1039,1043 ****
  	('uid', ('SEARCH', 'ALL')),
  	('response', ('EXISTS',)),
! 	('append', (None, None, None, 'From: anon@x.y.z\n\ndata...')),
  	('recent', ()),
  	('logout', ()),
--- 1052,1056 ----
  	('uid', ('SEARCH', 'ALL')),
  	('response', ('EXISTS',)),
! 	('append', (None, None, None, test_mesg)),
  	('recent', ()),
  	('logout', ()),



From fdrake@weyr.cnri.reston.va.us  Thu Feb 17 17:30:43 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 17 Feb 2000 12:30:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib ntpath.py,1.22,1.23
Message-ID: <200002171730.MAA29335@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	ntpath.py 
Log Message:

Typo in a comment:  "wheter" --> "whether"


Index: ntpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ntpath.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** ntpath.py	2000/02/02 16:54:39	1.22
--- ntpath.py	2000/02/17 17:30:40	1.23
***************
*** 22,26 ****
  
  
! # Return wheter a path is absolute.
  # Trivial in Posix, harder on the Mac or MS-DOS.
  # For DOS it is absolute if it starts with a slash or backslash (current
--- 22,26 ----
  
  
! # Return whether a path is absolute.
  # Trivial in Posix, harder on the Mac or MS-DOS.
  # For DOS it is absolute if it starts with a slash or backslash (current



From fdrake@weyr.cnri.reston.va.us  Thu Feb 17 17:37:09 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 17 Feb 2000 12:37:09 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc Makefile,1.190.2.1,1.190.2.2
Message-ID: <200002171737.MAA29395@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	Makefile 
Log Message:

Don't include */*.png in the tarballs; they only exist on the head
branch of the CVS repository, not on the 1.5.2 maintenance branch.


Index: Makefile
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/Makefile,v
retrieving revision 1.190.2.1
retrieving revision 1.190.2.2
diff -C2 -r1.190.2.1 -r1.190.2.2
*** Makefile	2000/02/16 18:53:49	1.190.2.1
--- Makefile	2000/02/17 17:37:06	1.190.2.2
***************
*** 245,259 ****
  html-$(RELEASE).tgz:	html
  	(cd $(HTMLDIR); \
! 		tar cf - *index.html ???/*.css ???/*.html */*.gif */*.png) \
  		| gzip -9 >$@
  
  html-$(RELEASE).tar.bz2:	html
  	(cd $(HTMLDIR); \
! 		tar cf - *index.html ???/*.css ???/*.html */*.gif */*.png) \
  		| bzip2 -9 >$@
  
  html-$(RELEASE).zip:	html
  	(cd $(HTMLDIR); \
! 		zip -9 ../$@ *index.html ???/*.css ???/*.html */*.gif */*.png)
  
  # convenience targets:
--- 245,259 ----
  html-$(RELEASE).tgz:	html
  	(cd $(HTMLDIR); \
! 		tar cf - *index.html ???/*.css ???/*.html */*.gif) \
  		| gzip -9 >$@
  
  html-$(RELEASE).tar.bz2:	html
  	(cd $(HTMLDIR); \
! 		tar cf - *index.html ???/*.css ???/*.html */*.gif) \
  		| bzip2 -9 >$@
  
  html-$(RELEASE).zip:	html
  	(cd $(HTMLDIR); \
! 		zip -9 ../$@ *index.html ???/*.css ???/*.html */*.gif)
  
  # convenience targets:



From fdrake@weyr.cnri.reston.va.us  Thu Feb 17 17:45:55 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 17 Feb 2000 12:45:55 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libfuncs.tex,1.60,1.61
Message-ID: <200002171745.MAA29518@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc/lib

Modified Files:
	libfuncs.tex 
Log Message:

Update the description of int() to include the radix parameter;
omission noted on c.l.py by Aahz Maruch.

Swapped the order of the descriptions of int() and intern() so that
int() comes first (the functions are in alphabetic order).


Index: libfuncs.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libfuncs.tex,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** libfuncs.tex	1999/08/05 13:43:08	1.60
--- libfuncs.tex	2000/02/17 17:45:52	1.61
***************
*** 313,316 ****
--- 313,332 ----
  \end{funcdesc}
  
+ \begin{funcdesc}{int}{x\optional{, radix}}
+   Convert a string or number to a plain integer.  If the argument is a
+   string, it must contain a possibly signed decimal number
+   representable as a Python integer, possibly embedded in whitespace;
+   this behaves identical to \code{string.atoi(\var{x}\optional{,
+   \var{radix}})}.  The \var{radix} parameter gives the base for the
+   conversion and may be any integer in the range $[2, 36]$.  If
+   \var{radix} is specified and \var{x} is not a string,
+   \exception{TypeError} is raised.
+   Otherwise, the argument may be a plain or
+   long integer or a floating point number.  Conversion of floating
+   point numbers to integers is defined by the C semantics; normally
+   the conversion truncates towards zero.\footnote{This is ugly --- the
+   language definition should require truncation towards zero.}
+ \end{funcdesc}
+ 
  \begin{funcdesc}{intern}{string}
    Enter \var{string} in the table of ``interned'' strings and return
***************
*** 324,339 ****
    have interned keys.  Interned strings are immortal (i.e. never get
    garbage collected).
- \end{funcdesc}
- 
- \begin{funcdesc}{int}{x}
-   Convert a string or number to a plain integer.  If the argument is a
-   string, it must contain a possibly signed decimal number
-   representable as a Python integer, possibly embedded in whitespace;
-   this behaves identical to \code{string.atoi(\var{x})}.
-   Otherwise, the argument may be a plain or
-   long integer or a floating point number.  Conversion of floating
-   point numbers to integers is defined by the C semantics; normally
-   the conversion truncates towards zero.\footnote{This is ugly --- the
-   language definition should require truncation towards zero.}
  \end{funcdesc}
  
--- 340,343 ----



From jhylton@cnri.reston.va.us  Thu Feb 17 17:56:33 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Thu, 17 Feb 2000 12:56:33 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler compile.py,1.15,1.16
Message-ID: <200002171756.MAA21312@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	compile.py 
Log Message:
satisfy the tabnanny
fix broken references to filename var in generateXXX methods


Index: compile.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/compile.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** compile.py	2000/02/16 00:55:44	1.15
--- compile.py	2000/02/17 17:56:29	1.16
***************
*** 81,85 ****
  
      def __init__(self):
! 	self.node = None
  
      def preorder(self, tree, visitor):
--- 81,85 ----
  
      def __init__(self):
!         self.node = None
  
      def preorder(self, tree, visitor):
***************
*** 164,170 ****
      def __init__(self, filename="<?>"):
          self.filename = filename
! 	self.code = PyAssembler()
          self.code.setFlags(0)
! 	self.locals = misc.Stack()
          self.loops = misc.Stack()
          self.namespace = 0
--- 164,170 ----
      def __init__(self, filename="<?>"):
          self.filename = filename
!         self.code = PyAssembler()
          self.code.setFlags(0)
!         self.locals = misc.Stack()
          self.loops = misc.Stack()
          self.namespace = 0
***************
*** 173,188 ****
  
      def emit(self, *args):
! 	# XXX could just use self.emit = self.code.emit
! 	apply(self.code.emit, args)
  
      def _generateFunctionOrLambdaCode(self, func):
          self.name = func.name
!         self.filename = filename
! 
          # keep a lookout for 'def foo((x,y)):'
          args, hasTupleArg = self.generateArglist(func.argnames)
          
! 	self.code = PyAssembler(args=args, name=func.name,
!                                  filename=filename)
          self.namespace = self.OPTIMIZED
          if func.varargs:
--- 173,187 ----
  
      def emit(self, *args):
!         # XXX could just use self.emit = self.code.emit
!         apply(self.code.emit, args)
  
      def _generateFunctionOrLambdaCode(self, func):
          self.name = func.name
!  
          # keep a lookout for 'def foo((x,y)):'
          args, hasTupleArg = self.generateArglist(func.argnames)
          
!         self.code = PyAssembler(args=args, name=func.name,
!                                 filename=self.filename)
          self.namespace = self.OPTIMIZED
          if func.varargs:
***************
*** 192,197 ****
          lnf = walk(func.code, LocalNameFinder(args), 0)
          self.locals.push(lnf.getLocals())
! 	self.emit('SET_LINENO', func.lineno)
! 	if hasTupleArg:
              self.generateArgUnpack(func.argnames)
          walk(func.code, self)
--- 191,196 ----
          lnf = walk(func.code, LocalNameFinder(args), 0)
          self.locals.push(lnf.getLocals())
!         self.emit('SET_LINENO', func.lineno)
!         if hasTupleArg:
              self.generateArgUnpack(func.argnames)
          walk(func.code, self)
***************
*** 240,244 ****
      def generateClassCode(self, klass):
          self.code = PyAssembler(name=klass.name,
!                                  filename=filename)
          self.emit('SET_LINENO', klass.lineno)
          lnf = walk(klass.code, LocalNameFinder(), 0)
--- 239,243 ----
      def generateClassCode(self, klass):
          self.code = PyAssembler(name=klass.name,
!                                  filename=self.filename)
          self.emit('SET_LINENO', klass.lineno)
          lnf = walk(klass.code, LocalNameFinder(), 0)
***************
*** 255,259 ****
  
      def isLocalName(self, name):
! 	return self.locals.top().has_elt(name)
  
      def _nameOp(self, prefix, name):
--- 254,258 ----
  
      def isLocalName(self, name):
!         return self.locals.top().has_elt(name)
  
      def _nameOp(self, prefix, name):
***************
*** 291,296 ****
  
      def visitModule(self, node):
! 	lnf = walk(node.node, LocalNameFinder(), 0)
! 	self.locals.push(lnf.getLocals())
          self.visit(node.node)
          self.emit('LOAD_CONST', None)
--- 290,295 ----
  
      def visitModule(self, node):
!         lnf = walk(node.node, LocalNameFinder(), 0)
!         self.locals.push(lnf.getLocals())
          self.visit(node.node)
          self.emit('LOAD_CONST', None)
***************
*** 354,366 ****
          if hasattr(node, 'lineno'):
              self.emit('SET_LINENO', node.lineno)
! 	self.visit(node.node)
! 	for arg in node.args:
! 	    self.visit(arg)
              if isinstance(arg, ast.Keyword):
                  kw = kw + 1
              else:
                  pos = pos + 1
! 	self.emit('CALL_FUNCTION', kw << 8 | pos)
! 	return 1
  
      def visitKeyword(self, node):
--- 353,365 ----
          if hasattr(node, 'lineno'):
              self.emit('SET_LINENO', node.lineno)
!         self.visit(node.node)
!         for arg in node.args:
!             self.visit(arg)
              if isinstance(arg, ast.Keyword):
                  kw = kw + 1
              else:
                  pos = pos + 1
!         self.emit('CALL_FUNCTION', kw << 8 | pos)
!         return 1
  
      def visitKeyword(self, node):
***************
*** 370,391 ****
  
      def visitIf(self, node):
! 	after = StackRef()
! 	for test, suite in node.tests:
              if hasattr(test, 'lineno'):
                  self.emit('SET_LINENO', test.lineno)
              else:
                  print "warning", "no line number"
! 	    self.visit(test)
! 	    dest = StackRef()
! 	    self.emit('JUMP_IF_FALSE', dest)
! 	    self.emit('POP_TOP')
! 	    self.visit(suite)
! 	    self.emit('JUMP_FORWARD', after)
! 	    dest.bind(self.code.getCurInst())
! 	    self.emit('POP_TOP')
! 	if node.else_:
! 	    self.visit(node.else_)
! 	after.bind(self.code.getCurInst())
! 	return 1
  
      def startLoop(self):
--- 369,390 ----
  
      def visitIf(self, node):
!         after = StackRef()
!         for test, suite in node.tests:
              if hasattr(test, 'lineno'):
                  self.emit('SET_LINENO', test.lineno)
              else:
                  print "warning", "no line number"
!             self.visit(test)
!             dest = StackRef()
!             self.emit('JUMP_IF_FALSE', dest)
!             self.emit('POP_TOP')
!             self.visit(suite)
!             self.emit('JUMP_FORWARD', after)
!             dest.bind(self.code.getCurInst())
!             self.emit('POP_TOP')
!         if node.else_:
!             self.visit(node.else_)
!         after.bind(self.code.getCurInst())
!         return 1
  
      def startLoop(self):
***************
*** 517,578 ****
  
      def visitCompare(self, node):
! 	"""Comment from compile.c follows:
  
! 	The following code is generated for all but the last
! 	comparison in a chain:
! 	   
! 	label:	on stack:	opcode:		jump to:
! 	   
! 		a		<code to load b>
! 		a, b		DUP_TOP
! 		a, b, b		ROT_THREE
! 		b, a, b		COMPARE_OP
! 		b, 0-or-1	JUMP_IF_FALSE	L1
! 		b, 1		POP_TOP
! 		b		
! 	
! 	We are now ready to repeat this sequence for the next
! 	comparison in the chain.
! 	   
! 	For the last we generate:
! 	   
! 	   	b		<code to load c>
! 	   	b, c		COMPARE_OP
! 	   	0-or-1		
! 	   
! 	If there were any jumps to L1 (i.e., there was more than one
! 	comparison), we generate:
! 	   
! 	   	0-or-1		JUMP_FORWARD	L2
! 	   L1:	b, 0		ROT_TWO
! 	   	0, b		POP_TOP
! 	   	0
! 	   L2:	0-or-1
! 	"""
! 	self.visit(node.expr)
! 	# if refs are never emitted, subsequent bind call has no effect
! 	l1 = StackRef()
! 	l2 = StackRef()
! 	for op, code in node.ops[:-1]:
! 	    # emit every comparison except the last
! 	    self.visit(code)
! 	    self.emit('DUP_TOP')
! 	    self.emit('ROT_THREE')
! 	    self.emit('COMPARE_OP', op)
              # dupTop and compareOp cancel stack effect
! 	    self.emit('JUMP_IF_FALSE', l1)
! 	    self.emit('POP_TOP')
! 	if node.ops:
! 	    # emit the last comparison
! 	    op, code = node.ops[-1]
! 	    self.visit(code)
! 	    self.emit('COMPARE_OP', op)
! 	if len(node.ops) > 1:
! 	    self.emit('JUMP_FORWARD', l2)
! 	    l1.bind(self.code.getCurInst())
! 	    self.emit('ROT_TWO')
! 	    self.emit('POP_TOP')
! 	    l2.bind(self.code.getCurInst())
! 	return 1
  
      def visitGetattr(self, node):
--- 516,577 ----
  
      def visitCompare(self, node):
!         """Comment from compile.c follows:
  
!         The following code is generated for all but the last
!         comparison in a chain:
!            
!         label:  on stack:       opcode:         jump to:
!            
!                 a               <code to load b>
!                 a, b            DUP_TOP
!                 a, b, b         ROT_THREE
!                 b, a, b         COMPARE_OP
!                 b, 0-or-1       JUMP_IF_FALSE   L1
!                 b, 1            POP_TOP
!                 b               
!         
!         We are now ready to repeat this sequence for the next
!         comparison in the chain.
!            
!         For the last we generate:
!            
!                 b               <code to load c>
!                 b, c            COMPARE_OP
!                 0-or-1          
!            
!         If there were any jumps to L1 (i.e., there was more than one
!         comparison), we generate:
!            
!                 0-or-1          JUMP_FORWARD    L2
!            L1:  b, 0            ROT_TWO
!                 0, b            POP_TOP
!                 0
!            L2:  0-or-1
!         """
!         self.visit(node.expr)
!         # if refs are never emitted, subsequent bind call has no effect
!         l1 = StackRef()
!         l2 = StackRef()
!         for op, code in node.ops[:-1]:
!             # emit every comparison except the last
!             self.visit(code)
!             self.emit('DUP_TOP')
!             self.emit('ROT_THREE')
!             self.emit('COMPARE_OP', op)
              # dupTop and compareOp cancel stack effect
!             self.emit('JUMP_IF_FALSE', l1)
!             self.emit('POP_TOP')
!         if node.ops:
!             # emit the last comparison
!             op, code = node.ops[-1]
!             self.visit(code)
!             self.emit('COMPARE_OP', op)
!         if len(node.ops) > 1:
!             self.emit('JUMP_FORWARD', l2)
!             l1.bind(self.code.getCurInst())
!             self.emit('ROT_TWO')
!             self.emit('POP_TOP')
!             l2.bind(self.code.getCurInst())
!         return 1
  
      def visitGetattr(self, node):
***************
*** 591,595 ****
          elif node.flags == 'OP_ASSIGN':
              self.emit('STORE_SUBSCR')
! 	elif node.flags == 'OP_DELETE':
              self.emit('DELETE_SUBSCR')
          return 1
--- 590,594 ----
          elif node.flags == 'OP_ASSIGN':
              self.emit('STORE_SUBSCR')
!         elif node.flags == 'OP_DELETE':
              self.emit('DELETE_SUBSCR')
          return 1
***************
*** 625,633 ****
          self.emit('SET_LINENO', node.lineno)
          self.visit(node.expr)
! 	dups = len(node.nodes) - 1
          for i in range(len(node.nodes)):
! 	    elt = node.nodes[i]
! 	    if i < dups:
! 		self.emit('DUP_TOP')
              if isinstance(elt, ast.Node):
                  self.visit(elt)
--- 624,632 ----
          self.emit('SET_LINENO', node.lineno)
          self.visit(node.expr)
!         dups = len(node.nodes) - 1
          for i in range(len(node.nodes)):
!             elt = node.nodes[i]
!             if i < dups:
!                 self.emit('DUP_TOP')
              if isinstance(elt, ast.Node):
                  self.visit(elt)
***************
*** 660,667 ****
  
      def binaryOp(self, node, op):
! 	self.visit(node.left)
! 	self.visit(node.right)
! 	self.emit(op)
! 	return 1
  
      def unaryOp(self, node, op):
--- 659,666 ----
  
      def binaryOp(self, node, op):
!         self.visit(node.left)
!         self.visit(node.right)
!         self.emit(op)
!         return 1
  
      def unaryOp(self, node, op):
***************
*** 671,696 ****
  
      def visitAdd(self, node):
! 	return self.binaryOp(node, 'BINARY_ADD')
  
      def visitSub(self, node):
! 	return self.binaryOp(node, 'BINARY_SUBTRACT')
  
      def visitMul(self, node):
! 	return self.binaryOp(node, 'BINARY_MULTIPLY')
  
      def visitDiv(self, node):
! 	return self.binaryOp(node, 'BINARY_DIVIDE')
  
      def visitMod(self, node):
! 	return self.binaryOp(node, 'BINARY_MODULO')
  
      def visitPower(self, node):
! 	return self.binaryOp(node, 'BINARY_POWER')
  
      def visitLeftShift(self, node):
! 	return self.binaryOp(node, 'BINARY_LSHIFT')
  
      def visitRightShift(self, node):
! 	return self.binaryOp(node, 'BINARY_RSHIFT')
  
      def visitInvert(self, node):
--- 670,695 ----
  
      def visitAdd(self, node):
!         return self.binaryOp(node, 'BINARY_ADD')
  
      def visitSub(self, node):
!         return self.binaryOp(node, 'BINARY_SUBTRACT')
  
      def visitMul(self, node):
!         return self.binaryOp(node, 'BINARY_MULTIPLY')
  
      def visitDiv(self, node):
!         return self.binaryOp(node, 'BINARY_DIVIDE')
  
      def visitMod(self, node):
!         return self.binaryOp(node, 'BINARY_MODULO')
  
      def visitPower(self, node):
!         return self.binaryOp(node, 'BINARY_POWER')
  
      def visitLeftShift(self, node):
!         return self.binaryOp(node, 'BINARY_LSHIFT')
  
      def visitRightShift(self, node):
!         return self.binaryOp(node, 'BINARY_RSHIFT')
  
      def visitInvert(self, node):
***************
*** 713,730 ****
  
      def bitOp(self, nodes, op):
! 	self.visit(nodes[0])
! 	for node in nodes[1:]:
! 	    self.visit(node)
! 	    self.emit(op)
! 	return 1
  
      def visitBitand(self, node):
! 	return self.bitOp(node.nodes, 'BINARY_AND')
  
      def visitBitor(self, node):
! 	return self.bitOp(node.nodes, 'BINARY_OR')
  
      def visitBitxor(self, node):
! 	return self.bitOp(node.nodes, 'BINARY_XOR')
  
      def visitTest(self, node, jump):
--- 712,729 ----
  
      def bitOp(self, nodes, op):
!         self.visit(nodes[0])
!         for node in nodes[1:]:
!             self.visit(node)
!             self.emit(op)
!         return 1
  
      def visitBitand(self, node):
!         return self.bitOp(node.nodes, 'BINARY_AND')
  
      def visitBitor(self, node):
!         return self.bitOp(node.nodes, 'BINARY_OR')
  
      def visitBitxor(self, node):
!         return self.bitOp(node.nodes, 'BINARY_XOR')
  
      def visitTest(self, node, jump):
***************
*** 739,758 ****
  
      def visitAssert(self, node):
! 	# XXX __debug__ and AssertionError appear to be special cases
! 	# -- they are always loaded as globals even if there are local
! 	# names.  I guess this is a sort of renaming op.
! 	skip = StackRef()
! 	self.emit('SET_LINENO', node.lineno)
! 	self.emit('LOAD_GLOBAL', '__debug__')
! 	self.emit('JUMP_IF_FALSE', skip)
! 	self.emit('POP_TOP')
! 	self.visit(node.test)
! 	self.emit('JUMP_IF_TRUE', skip)
! 	self.emit('LOAD_GLOBAL', 'AssertionError')
! 	self.visit(node.fail)
! 	self.emit('RAISE_VARARGS', 2)
! 	skip.bind(self.code.getCurInst())
! 	self.emit('POP_TOP')
! 	return 1
  
      def visitAnd(self, node):
--- 738,757 ----
  
      def visitAssert(self, node):
!         # XXX __debug__ and AssertionError appear to be special cases
!         # -- they are always loaded as globals even if there are local
!         # names.  I guess this is a sort of renaming op.
!         skip = StackRef()
!         self.emit('SET_LINENO', node.lineno)
!         self.emit('LOAD_GLOBAL', '__debug__')
!         self.emit('JUMP_IF_FALSE', skip)
!         self.emit('POP_TOP')
!         self.visit(node.test)
!         self.emit('JUMP_IF_TRUE', skip)
!         self.emit('LOAD_GLOBAL', 'AssertionError')
!         self.visit(node.fail)
!         self.emit('RAISE_VARARGS', 2)
!         skip.bind(self.code.getCurInst())
!         self.emit('POP_TOP')
!         return 1
  
      def visitAnd(self, node):
***************
*** 766,775 ****
  
      def visitConst(self, node):
! 	self.emit('LOAD_CONST', node.value)
          return 1
  
      def visitEllipsis(self, node):
! 	self.emit('LOAD_CONST', Ellipsis)
! 	return 1
  
      def visitTuple(self, node):
--- 765,774 ----
  
      def visitConst(self, node):
!         self.emit('LOAD_CONST', node.value)
          return 1
  
      def visitEllipsis(self, node):
!         self.emit('LOAD_CONST', Ellipsis)
!         return 1
  
      def visitTuple(self, node):
***************
*** 786,850 ****
  
      def visitDict(self, node):
! 	self.emit('BUILD_MAP', 0)
! 	for k, v in node.items:
! 	    # XXX need to add set lineno when there aren't constants
! 	    self.emit('DUP_TOP')
! 	    self.visit(v)
! 	    self.emit('ROT_TWO')
! 	    self.visit(k)
! 	    self.emit('STORE_SUBSCR')
! 	return 1
  
      def visitReturn(self, node):
! 	self.emit('SET_LINENO', node.lineno)
! 	self.visit(node.value)
! 	self.emit('RETURN_VALUE')
! 	return 1
  
      def visitRaise(self, node):
! 	self.emit('SET_LINENO', node.lineno)
! 	n = 0
! 	if node.expr1:
! 	    self.visit(node.expr1)
! 	    n = n + 1
! 	if node.expr2:
! 	    self.visit(node.expr2)
! 	    n = n + 1
! 	if node.expr3:
! 	    self.visit(node.expr3)
! 	    n = n + 1
! 	self.emit('RAISE_VARARGS', n)
! 	return 1
  
      def visitPrint(self, node):
! 	self.emit('SET_LINENO', node.lineno)
! 	for child in node.nodes:
! 	    self.visit(child)
! 	    self.emit('PRINT_ITEM')
! 	return 1
  
      def visitPrintnl(self, node):
! 	self.visitPrint(node)
! 	self.emit('PRINT_NEWLINE')
! 	return 1
  
      def visitExec(self, node):
! 	self.visit(node.expr)
! 	if node.locals is None:
! 	    self.emit('LOAD_CONST', None)
! 	else:
! 	    self.visit(node.locals)
! 	if node.globals is None:
! 	    self.emit('DUP_TOP')
! 	else:
! 	    self.visit(node.globals)
! 	self.emit('EXEC_STMT')
  
  class LocalNameFinder:
      def __init__(self, names=()):
! 	self.names = misc.Set()
          self.globals = misc.Set()
! 	for name in names:
! 	    self.names.add(name)
  
      def getLocals(self):
--- 785,849 ----
  
      def visitDict(self, node):
!         self.emit('BUILD_MAP', 0)
!         for k, v in node.items:
!             # XXX need to add set lineno when there aren't constants
!             self.emit('DUP_TOP')
!             self.visit(v)
!             self.emit('ROT_TWO')
!             self.visit(k)
!             self.emit('STORE_SUBSCR')
!         return 1
  
      def visitReturn(self, node):
!         self.emit('SET_LINENO', node.lineno)
!         self.visit(node.value)
!         self.emit('RETURN_VALUE')
!         return 1
  
      def visitRaise(self, node):
!         self.emit('SET_LINENO', node.lineno)
!         n = 0
!         if node.expr1:
!             self.visit(node.expr1)
!             n = n + 1
!         if node.expr2:
!             self.visit(node.expr2)
!             n = n + 1
!         if node.expr3:
!             self.visit(node.expr3)
!             n = n + 1
!         self.emit('RAISE_VARARGS', n)
!         return 1
  
      def visitPrint(self, node):
!         self.emit('SET_LINENO', node.lineno)
!         for child in node.nodes:
!             self.visit(child)
!             self.emit('PRINT_ITEM')
!         return 1
  
      def visitPrintnl(self, node):
!         self.visitPrint(node)
!         self.emit('PRINT_NEWLINE')
!         return 1
  
      def visitExec(self, node):
!         self.visit(node.expr)
!         if node.locals is None:
!             self.emit('LOAD_CONST', None)
!         else:
!             self.visit(node.locals)
!         if node.globals is None:
!             self.emit('DUP_TOP')
!         else:
!             self.visit(node.globals)
!         self.emit('EXEC_STMT')
  
  class LocalNameFinder:
      def __init__(self, names=()):
!         self.names = misc.Set()
          self.globals = misc.Set()
!         for name in names:
!             self.names.add(name)
  
      def getLocals(self):
***************
*** 852,859 ****
              if self.names.has_elt(elt):
                  self.names.remove(elt)
! 	return self.names
  
      def visitDict(self, node):
! 	return 1
  
      def visitGlobal(self, node):
--- 851,858 ----
              if self.names.has_elt(elt):
                  self.names.remove(elt)
!         return self.names
  
      def visitDict(self, node):
!         return 1
  
      def visitGlobal(self, node):
***************
*** 864,868 ****
      def visitFunction(self, node):
          self.names.add(node.name)
! 	return 1
  
      def visitLambda(self, node):
--- 863,867 ----
      def visitFunction(self, node):
          self.names.add(node.name)
!         return 1
  
      def visitLambda(self, node):
***************
*** 870,886 ****
  
      def visitImport(self, node):
! 	for name in node.names:
! 	    self.names.add(name)
  
      def visitFrom(self, node):
! 	for name in node.names:
! 	    self.names.add(name)
  
      def visitClassdef(self, node):
! 	self.names.add(node.name)
! 	return 1
  
      def visitAssName(self, node):
! 	self.names.add(node.name)
  
  class Loop:
--- 869,885 ----
  
      def visitImport(self, node):
!         for name in node.names:
!             self.names.add(name)
  
      def visitFrom(self, node):
!         for name in node.names:
!             self.names.add(name)
  
      def visitClassdef(self, node):
!         self.names.add(node.name)
!         return 1
  
      def visitAssName(self, node):
!         self.names.add(node.name)
  
  class Loop:
***************
*** 927,931 ****
          mtime = struct.pack('i', mtime)
          return magic + mtime
! 	
  if __name__ == "__main__":
      import getopt
--- 926,936 ----
          mtime = struct.pack('i', mtime)
          return magic + mtime
! 
! def compile(filename):
!     buf = open(filename).read()
!     mod = CompiledModule(buf, filename)
!     mod.compile()
!     mod.dump(filename + 'c')
!         
  if __name__ == "__main__":
      import getopt
***************
*** 946,951 ****
              if VERBOSE:
                  print filename
!             buf = open(filename).read()
!             mod = CompiledModule(buf, filename)
!             mod.compile()
!             mod.dump(filename + 'c')
--- 951,953 ----
              if VERBOSE:
                  print filename
!             compile(filename)



From fdrake@weyr.cnri.reston.va.us  Thu Feb 17 18:02:42 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 17 Feb 2000 13:02:42 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tut tut.tex,1.100.2.2,1.100.2.3
Message-ID: <200002171802.NAA00115@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tut
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tut

Modified Files:
      Tag: release152p1-patches
	tut.tex 
Log Message:

Patch from Skip Montanaro <skip@mojam.com>, with *really* minor markup 
nits fixed:

The diff below has one significant change (the English description of the
comparison operators).  The first and last changes are quite trivial.  The
third change isn't truly earth-shaking, but may serve somewhat to appease C
programmers investigating Python for the first time.


Index: tut.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tut/tut.tex,v
retrieving revision 1.100.2.2
retrieving revision 1.100.2.3
diff -C2 -r1.100.2.2 -r1.100.2.3
*** tut.tex	1999/12/03 22:00:31	1.100.2.2
--- tut.tex	2000/02/17 18:02:39	1.100.2.3
***************
*** 113,118 ****
  
  Python allows writing very compact and readable programs.  Programs
! written in Python are typically much shorter than equivalent C
! programs, for several reasons:
  \begin{itemize}
  \item
--- 113,118 ----
  
  Python allows writing very compact and readable programs.  Programs
! written in Python are typically much shorter than equivalent C or
! \Cpp{} programs, for several reasons:
  \begin{itemize}
  \item
***************
*** 854,859 ****
  length is true, empty sequences are false.  The test used in the
  example is a simple comparison.  The standard comparison operators are
! written the same as in C: \code{<}, \code{>}, \code{==}, \code{<=},
! \code{>=} and \code{!=}.
  
  \item
--- 854,860 ----
  length is true, empty sequences are false.  The test used in the
  example is a simple comparison.  The standard comparison operators are
! written the same as in C: \code{<} (less than), \code{>} (greater than),
! \code{==} (equal to), \code{<=} (less than or equal to),
! \code{>=} (greater than or equal to) and \code{!=} (not equal to).
  
  \item
***************
*** 1780,1783 ****
--- 1781,1787 ----
  
  Note that in Python, unlike C, assignment cannot occur inside expressions.
+ C programmers may grumble about this, but it avoids a common class of
+ problems encountered in C programs: typing \code{=} in an expression when
+ \code{==} was intended.
  
  \section{Comparing Sequences and Other Types \label{comparing}}
***************
*** 3461,3465 ****
  defined in the same base class, may in fact end up calling a method of
  a derived class that overrides it.  (For \Cpp{} programmers: all methods
! in Python are ``virtual functions''.)
  
  An overriding method in a derived class may in fact want to extend
--- 3465,3469 ----
  defined in the same base class, may in fact end up calling a method of
  a derived class that overrides it.  (For \Cpp{} programmers: all methods
! in Python are effectively \keyword{virtual}.)
  
  An overriding method in a derived class may in fact want to extend



From jhylton@cnri.reston.va.us  Thu Feb 17 22:06:23 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Thu, 17 Feb 2000 17:06:23 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/p2c ast.py,1.6,1.7
Message-ID: <200002172206.RAA23464@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/p2c
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/p2c

Modified Files:
	ast.py 
Log Message:
add varargs and kwargs flags to Lambda nodes


Index: ast.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/p2c/ast.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ast.py	2000/02/15 21:30:00	1.6
--- ast.py	2000/02/17 22:06:20	1.7
***************
*** 106,109 ****
--- 106,114 ----
      self.code = code
      self._children = ('lambda', argnames, defaults, flags, code)
+     self.varargs = self.kwargs = None
+     if flags & CO_VARARGS:
+       self.varargs = 1
+     if flags & CO_VARKEYWORDS:
+       self.kwargs = 1
  
    def __repr__(self):



From jhylton@cnri.reston.va.us  Thu Feb 17 22:09:38 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Thu, 17 Feb 2000 17:09:38 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler compile.py,1.16,1.17 pyassem.py,1.3,1.4
Message-ID: <200002172209.RAA23491@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	compile.py pyassem.py 
Log Message:
the previous quick hack to fix def foo((x,y)) failed on some cases
(big surprise).  new solution is a little less hackish.

Code gen adds a TupleArg instance in the argument slot. The tuple arg
includes a copy of the names that it is responsble for binding.  The
PyAssembler uses this information to calculate the correct argcount.

all fix this wacky case: del (a, ((b,), c)), d
which is the same as: del a, b, c, d
(Can't wait for Guido to tell me why.)

solution uses findOp which walks a tree to find out whether it
contains OP_ASSIGN or OP_DELETE or ...



Index: compile.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/compile.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** compile.py	2000/02/17 17:56:29	1.16
--- compile.py	2000/02/17 22:09:35	1.17
***************
*** 7,11 ****
  
  from p2c import transformer, ast
! from pyassem import StackRef, PyAssembler
  import dis
  import misc
--- 7,11 ----
  
  from p2c import transformer, ast
! from pyassem import StackRef, PyAssembler, TupleArg
  import dis
  import misc
***************
*** 204,208 ****
                  args.append(elt)
              elif type(elt) == types.TupleType:
!                 args.append(".nested%d" % count)
                  count = count + 1
                  extra.extend(misc.flatten(elt))
--- 204,208 ----
                  args.append(elt)
              elif type(elt) == types.TupleType:
!                 args.append(TupleArg(count, elt))
                  count = count + 1
                  extra.extend(misc.flatten(elt))
***************
*** 344,348 ****
      def visitLambda(self, node):
          node.name = '<lambda>'
-         node.varargs = node.kwargs = None
          self._visitFuncOrLambda(node, 'Lambda')
          return 1
--- 344,347 ----
***************
*** 634,641 ****
  
      def visitAssName(self, node):
!         # XXX handle OP_DELETE
!         if node.flags != 'OP_ASSIGN':
              print "oops", node.flags
!         self.storeName(node.name)
  
      def visitAssAttr(self, node):
--- 633,643 ----
  
      def visitAssName(self, node):
!         if node.flags == 'OP_ASSIGN':
!             self.storeName(node.name)
!         elif node.flags == 'OP_DELETE':
!             self.delName(node.name)
!         else:
              print "oops", node.flags
!         return 1
  
      def visitAssAttr(self, node):
***************
*** 651,655 ****
  
      def visitAssTuple(self, node):
!         self.emit('UNPACK_TUPLE', len(node.nodes))
          for child in node.nodes:
              self.visit(child)
--- 653,658 ----
  
      def visitAssTuple(self, node):
!         if findOp(node) != 'OP_DELETE':
!             self.emit('UNPACK_TUPLE', len(node.nodes))
          for child in node.nodes:
              self.visit(child)
***************
*** 839,842 ****
--- 842,846 ----
              self.visit(node.globals)
          self.emit('EXEC_STMT')
+         return 1
  
  class LocalNameFinder:
***************
*** 882,885 ****
--- 886,903 ----
      def visitAssName(self, node):
          self.names.add(node.name)
+ 
+ class OpFinder:
+     def __init__(self):
+         self.op = None
+     def visitAssName(self, node):
+         if self.op is None:
+             self.op = node.flags
+         elif self.op != node.flags:
+             raise ValueError, "mixed ops in stmt"
+ 
+ def findOp(node):
+     v = OpFinder()
+     walk(node, v)
+     return v.op
  
  class Loop:

Index: pyassem.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/pyassem.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pyassem.py	2000/02/16 00:50:29	1.3
--- pyassem.py	2000/02/17 22:09:35	1.4
***************
*** 43,46 ****
--- 43,55 ----
  CO_VARKEYWORDS = 0x0008
  
+ class TupleArg:
+     def __init__(self, count, names):
+         self.count = count
+         self.names = names
+     def __repr__(self):
+         return "TupleArg(%s, %s)" % (self.count, self.names)
+     def getName(self):
+         return ".nested%d" % self.count
+ 
  class PyAssembler:
      """Creates Python code objects
***************
*** 55,58 ****
--- 64,68 ----
          # used by makeCodeObject
          self._getArgCount(args)
+         print name, args, self.argcount
          self.code = ''
          self.consts = [docstring]
***************
*** 62,65 ****
--- 72,79 ----
          self.names = []
          self.varnames = list(args) or []
+         for i in range(len(self.varnames)):
+             var = self.varnames[i]
+             if isinstance(var, TupleArg):
+                 self.varnames[i] = var.getName()
          # lnotab support
          self.firstlineno = 0
***************
*** 69,80 ****
  
      def _getArgCount(self, args):
!         if args and args[0][0] == '.':
!             for i in range(len(args)):
!                 if args[i][0] == '.':
!                     num = i
!             self.argcount = num + 1
!         else:
!             self.argcount = len(args)
!                 
  
      def __repr__(self):
--- 83,92 ----
  
      def _getArgCount(self, args):
!         self.argcount = len(args)
!         if args:
!             for arg in args:
!                 if isinstance(arg, TupleArg):
!                     numNames = len(misc.flatten(arg.names))
!                     self.argcount = self.argcount - numNames 
  
      def __repr__(self):
***************
*** 89,93 ****
  
      def setVarArgs(self):
!         self.flags = self.flags | CO_VARARGS
  
      def setKWArgs(self):
--- 101,107 ----
  
      def setVarArgs(self):
!         if not self.flags & CO_VARARGS:
!             self.flags = self.flags | CO_VARARGS
!             self.argcount = self.argcount - 1
  
      def setKWArgs(self):



From jhylton@cnri.reston.va.us  Thu Feb 17 22:11:42 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Thu, 17 Feb 2000 17:11:42 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_func.py,1.7,1.8
Message-ID: <200002172211.RAA23514@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_func.py 
Log Message:
test some more variants of func defs


Index: test_func.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_func.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** test_func.py	2000/02/16 00:52:04	1.7
--- test_func.py	2000/02/17 22:11:39	1.8
***************
*** 10,21 ****
      return zfill(a, 10)
  
! def test4(((a, b), c), x, (d, (e, f))):
      return a + b * c - d / e + f
  
  def test():
      print test1(2)
      print test2('a', b='c', c='d', abc='42')
      print test3(None, Ellipsis, "365")
!     print test4(((10, 6), 2), 0, (6, (3, 22)))
  
  test()
--- 10,27 ----
      return zfill(a, 10)
  
! def test4(((a, b), c), x, (d, (e, f)), y, z):
      return a + b * c - d / e + f
  
+ def test5(a=1, *rest):
+     print rest
+     return map(lambda x, a=a: x + a, rest)
+ 
  def test():
      print test1(2)
      print test2('a', b='c', c='d', abc='42')
      print test3(None, Ellipsis, "365")
!     print test4(((10, 6), 2), 0, (6, (3, 22)), 0, 0)
!     print test5()
!     print test5(2, 0, 1, 2)
  
  test()



From jhylton@cnri.reston.va.us  Thu Feb 17 22:11:56 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Thu, 17 Feb 2000 17:11:56 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_misc.py,1.2,1.3
Message-ID: <200002172211.RAA23531@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_misc.py 
Log Message:
test the del nonsense



Index: test_misc.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_misc.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** test_misc.py	2000/02/15 21:46:33	1.2
--- test_misc.py	2000/02/17 22:11:53	1.3
***************
*** 11,12 ****
--- 11,13 ----
      print "ya"
  
+ del (((a,), d,),)



From jhylton@cnri.reston.va.us  Thu Feb 17 22:58:56 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Thu, 17 Feb 2000 17:58:56 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler pyassem.py,1.4,1.5
Message-ID: <200002172258.RAA23745@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	pyassem.py 
Log Message:
changes to _lookupName
- removed now (happily) unused second arg
- need to verify results of [].index are correct; for building consts,
  need to have same value and same type, e.g. 2 not the same as 2L




Index: pyassem.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/pyassem.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pyassem.py	2000/02/17 22:09:35	1.4
--- pyassem.py	2000/02/17 22:58:54	1.5
***************
*** 64,68 ****
          # used by makeCodeObject
          self._getArgCount(args)
-         print name, args, self.argcount
          self.code = ''
          self.consts = [docstring]
--- 64,67 ----
***************
*** 261,278 ****
      globalOps = ('LOAD_GLOBAL', 'STORE_GLOBAL', 'DELETE_GLOBAL')
  
!     def _lookupName(self, name, list, list2=None):
!         """Return index of name in list, appending if necessary
! 
!         Yicky hack: Second list can be used for lookup of local names
!         where the name needs to be added to varnames and names.
!         """
          if name in list:
!             return list.index(name)
!         else:
!             end = len(list)
!             list.append(name)
!             if list2 is not None:
!                 list2.append(name)
!             return end
  
      # Convert some stuff from the dis module for local use
--- 260,277 ----
      globalOps = ('LOAD_GLOBAL', 'STORE_GLOBAL', 'DELETE_GLOBAL')
  
!     def _lookupName(self, name, list):
!         """Return index of name in list, appending if necessary"""
          if name in list:
!             i = list.index(name)
!             # this is cheap, but incorrect in some cases, e.g 2 vs. 2L
!             if type(name) == type(list[i]):
!                 return i
!             for i in range(len(list)):
!                 elt = list[i]
!                 if type(elt) == type(name) and elt == name:
!                     return i
!         end = len(list)
!         list.append(name)
!         return end
  
      # Convert some stuff from the dis module for local use



From fdrake@weyr.cnri.reston.va.us  Fri Feb 18 18:24:22 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 18 Feb 2000 13:24:22 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib liburllib.tex,1.20.4.1,1.20.4.2
Message-ID: <200002181824.NAA02625@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	liburllib.tex 
Log Message:

Patch from Skip Montanaro <skip@mojam.com>:

The appended patch updates liburllib.tex by

    * documenting use of HTTP proxies (I thought I sent this once before,
      but CVS still shows it missing)

    * providing an example of common usage (again, I thought I had sent this 
      before)

    * documenting the URLopener and FancyURLopener classes

    * describing how users of the urlopen and urlretrieve can override their
      default behavior by assigning a URLopener subclass to
      urllib._urlopener.

(Minor markup revisions by FLD; mostly consistency issues.)


Index: liburllib.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/liburllib.tex,v
retrieving revision 1.20.4.1
retrieving revision 1.20.4.2
diff -C2 -r1.20.4.1 -r1.20.4.2
*** liburllib.tex	2000/01/10 20:00:57	1.20.4.1
--- liburllib.tex	2000/02/18 18:24:19	1.20.4.2
***************
*** 1,7 ****
  \section{\module{urllib} ---
!          Open an arbitrary object given by URL.}
! \declaremodule{standard}{urllib}
  
! \modulesynopsis{Open an arbitrary object given by URL (requires sockets).}
  
  \index{WWW}
--- 1,7 ----
  \section{\module{urllib} ---
!          Open an arbitrary resource by URL}
  
! \declaremodule{standard}{urllib}
! \modulesynopsis{Open an arbitrary network resource by URL (requires sockets).}
  
  \index{WWW}
***************
*** 79,82 ****
--- 79,97 ----
  information from Internet\index{Internet Config} Config.
  
+ The \function{urlopen()} function works transparently with proxies.
+ In a \UNIX{} or Windows environment, set the \envvar{http_proxy},
+ \envvar{ftp_proxy} or \envvar{gopher_proxy} environment variables to a
+ URL that identifies the proxy server before starting the Python
+ interpreter, e.g.:
+ 
+ \begin{verbatim}
+ % http_proxy="http://www.someproxy.com:3128"
+ % export http_proxy
+ % python
+ ...
+ \end{verbatim}
+ 
+ In a Macintosh environment, \function{urlopen()} will retrieve proxy
+ information from Internet Config.
  \end{funcdesc}
  
***************
*** 143,146 ****
--- 158,234 ----
  \function{quote_plus()} above.
  \end{funcdesc}
+ 
+ The public functions \function{urlopen()} and \function{urlretrieve()}
+ create an instance of the \class{FancyURLopener} class and use it to perform
+ their requested actions.  To override this functionality, programmers can
+ create a subclass of \class{URLopener} or \class{FancyURLopener}, then
+ assign that class to the \var{urllib._urlopener} variable before calling the
+ desired function.  For example, applications may want to specify a different
+ \code{user-agent} header than \class{URLopener} defines.  This can be
+ accomplished with the following code:
+ 
+ \begin{verbatim}
+ class AppURLopener(urllib.FancyURLopener):
+     def __init__(self, *args):
+         apply(urllib.FancyURLopener.__init__, (self,) + args)
+         self.version = "App/1.7"
+ 
+ urllib._urlopener = AppURLopener
+ \end{verbatim}
+ 
+ \begin{classdesc}{URLopener}{\optional{proxies\optional{, **x509}}}
+ Base class for opening and reading URLs.  Unless you need to support
+ opening objects using schemes other than \file{http:}, \file{ftp:},
+ \file{gopher:} or \file{file:}, you probably want to use
+ \class{FancyURLopener}.
+ 
+ By default, the \class{URLopener} class sends a
+ \code{user-agent} header of \samp{urllib/\var{VVV}}, where
+ \var{VVV} is the \module{urllib} version number.  Applications can
+ define their own \code{user-agent} header by subclassing
+ \class{URLopener} or \class{FancyURLopener} and setting the instance
+ attribute \var{version} to an appropriate string value before the
+ \method{open()} method is called.
+ 
+ Additional keyword parameters, collected in \var{x509}, are used for
+ authentication with the \file{https:} scheme.  The keywords
+ \var{key_file} and \var{cert_file} are supported.
+ 
+ \begin{methoddesc}{open}{fullurl\optional{, data}}
+ Open \var{fullurl} using the appropriate protocol.  This method sets 
+ up cache and proxy information, then calls the appropriate open method with
+ its input arguments.  If the scheme is not recognized,
+ \method{open_unknown()} is called.  The \var{data} argument 
+ has the same meaning as the \var{data} argument of \function{urlopen()}.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{open_unknown}{fullurl\optional{, data}}
+ Overridable interface to open unknown URL types.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{retrieve}{url\optional{, filename\optional{, reporthook}}}
+ Retrieves the contents of \var{url} and places it in \var{filename}.  The
+ return value is a tuple consisting of a local filename and either a
+ \class{mimetools.Message} object containing the response headers (for remote
+ URLs) or None (for local URLs).  The caller must then open and read the
+ contents of \var{filename}.  If \var{filename} is not given and the URL
+ refers to a local file, the input filename is returned.  If the URL is
+ non-local and \var{filename} is not given, the filename is the output of
+ \function{tempfile.mktemp()} with a suffix that matches the suffix of the last
+ path component of the input URL.  If \var{reporthook} is given, it must be
+ a function accepting three numeric parameters.  It will be called after each
+ chunk of data is read from the network.  \var{reporthook} is ignored for
+ local URLs.
+ \end{methoddesc}
+ 
+ \end{classdesc}
+ 
+ \begin{classdesc}{FancyURLopener}
+ \class{FancyURLopener} subclasses \class{URLopener} providing default handling 
+ for the following HTTP response codes: 301, 302 or 401.  For 301 and 302
+ response codes, the \code{location} header is used to fetch the actual URL.
+ For 401 response codes (authentication required), basic HTTP authentication
+ is performed.
+ \end{classdesc}
  
  Restrictions:



From akuchlin@CNRI.Reston.VA.US  Fri Feb 18 18:30:04 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Fri, 18 Feb 2000 13:30:04 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules pcremodule.c,2.15,2.16
Message-ID: <200002181830.NAA04982@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory amarok:/home/akuchlin/src/Python-1.5/Modules

Modified Files:
	pcremodule.c 
Log Message:
Patch from Vladimir Marangozov <marangoz@python.inrialpes.fr>:
	The buffers self->regex and self->regex_extra are allocated in
	pcre_compile() and pcre_study() via pcre_malloc, but are released
	via free() instead of pcre_free.


Index: pcremodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/pcremodule.c,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** pcremodule.c	2000/02/04 20:33:27	2.15
--- pcremodule.c	2000/02/18 18:30:01	2.16
***************
*** 94,101 ****
  	PcreObject *self;
  {
! 	if (self->regex) free(self->regex);
! 	if (self->regex_extra) free(self->regex_extra);
! 	self->regex=NULL;
! 	self->regex_extra=NULL;
  	PyMem_DEL(self);
  }
--- 94,99 ----
  	PcreObject *self;
  {
! 	if (self->regex) (pcre_free)(self->regex);
! 	if (self->regex_extra) (pcre_free)(self->regex_extra);
  	PyMem_DEL(self);
  }



From akuchlin@CNRI.Reston.VA.US  Fri Feb 18 19:16:49 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Fri, 18 Feb 2000 14:16:49 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules pypcre.c,2.16,2.17
Message-ID: <200002181916.OAA05294@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory amarok:/home/akuchlin/src/Python-1.5/Modules

Modified Files:
	pypcre.c 
Log Message:
Patch from Vladimir Marangozov <marangoz@python.inrialpes.fr>
	The same problem (mixed mallocs) exists for the pcre stack.
	The buffers md->... are allocated via PyMem_RESIZE in grow_stack(),
	while in free_stack() they are released with free() instead of 
	PyMem_DEL().


Index: pypcre.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/pypcre.c,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -r2.16 -r2.17
*** pypcre.c	1999/01/27 21:41:08	2.16
--- pypcre.c	2000/02/18 19:16:45	2.17
***************
*** 3058,3067 ****
  {
  /* Free any stack space that was allocated by the call to match(). */
! if (md->off_num)    free(md->off_num); 
! if (md->offset_top) free(md->offset_top); 
! if (md->r1)         free(md->r1); 
! if (md->r2)         free(md->r2); 
! if (md->eptr)       free((char *)md->eptr); 
! if (md->ecode)      free((char *)md->ecode);
  return 0;
  }
--- 3058,3067 ----
  {
  /* Free any stack space that was allocated by the call to match(). */
! if (md->off_num)    PyMem_DEL(md->off_num); 
! if (md->offset_top) PyMem_DEL(md->offset_top); 
! if (md->r1)         PyMem_DEL(md->r1); 
! if (md->r2)         PyMem_DEL(md->r2); 
! if (md->eptr)       PyMem_DEL((char *)md->eptr); 
! if (md->ecode)      PyMem_DEL((char *)md->ecode);
  return 0;
  }



From fdrake@weyr.cnri.reston.va.us  Fri Feb 18 23:17:56 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 18 Feb 2000 18:17:56 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib liburllib.tex,1.20.4.2,1.20.4.3
Message-ID: <200002182317.SAA04462@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	liburllib.tex 
Log Message:

Clarified the use of keyword parameters for https authentication;
approved by Skip.


Index: liburllib.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/liburllib.tex,v
retrieving revision 1.20.4.2
retrieving revision 1.20.4.3
diff -C2 -r1.20.4.2 -r1.20.4.3
*** liburllib.tex	2000/02/18 18:24:19	1.20.4.2
--- liburllib.tex	2000/02/18 23:17:53	1.20.4.3
***************
*** 193,197 ****
  Additional keyword parameters, collected in \var{x509}, are used for
  authentication with the \file{https:} scheme.  The keywords
! \var{key_file} and \var{cert_file} are supported.
  
  \begin{methoddesc}{open}{fullurl\optional{, data}}
--- 193,198 ----
  Additional keyword parameters, collected in \var{x509}, are used for
  authentication with the \file{https:} scheme.  The keywords
! \var{key_file} and \var{cert_file} are supported; both are needed to
! actually retrieve a resource at an \file{https:} URL.
  
  \begin{methoddesc}{open}{fullurl\optional{, data}}



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 15:29:58 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 10:29:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/doc doc.tex,1.12.2.1,1.12.2.2
Message-ID: <200002211529.KAA06567@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1/doc

Modified Files:
      Tag: release152p1-patches
	doc.tex 
Log Message:

Fixed a couple of typos reported by Greg Ward <gward@python.net>.


Index: doc.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/doc/doc.tex,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -C2 -r1.12.2.1 -r1.12.2.2
*** doc.tex	2000/01/28 21:17:09	1.12.2.1
--- doc.tex	2000/02/21 15:29:55	1.12.2.2
***************
*** 714,718 ****
  
      Effective index generation for technical documents can be very
!     difficult, especially for someone familliar with the topic but not
      the creation of indexes.  Much of the difficulty arises in the
      area of terminology: including the terms an expert would use for a
--- 714,718 ----
  
      Effective index generation for technical documents can be very
!     difficult, especially for someone familiar with the topic but not
      the creation of indexes.  Much of the difficulty arises in the
      area of terminology: including the terms an expert would use for a
***************
*** 723,727 ****
      The truly difficult aspects of index generation are not areas with
      which the documentation tools can help.  However, ease
!     of producing the index once content decisions are make is within
      the scope of the tools.  Markup is provided which the processing
      software is able to use to generate a variety of kinds of index
--- 723,727 ----
      The truly difficult aspects of index generation are not areas with
      which the documentation tools can help.  However, ease
!     of producing the index once content decisions are made is within
      the scope of the tools.  Markup is provided which the processing
      software is able to use to generate a variety of kinds of index



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 16:12:04 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 11:12:04 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc TODO,1.24,1.24.2.1
Message-ID: <200002211612.LAA06769@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	TODO 
Log Message:

Substantially revise; this pertains specifically to the 1.5.2p2
release.

Now organized by manual.


Index: TODO
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/TODO,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -r1.24 -r1.24.2.1
*** TODO	1999/08/19 15:37:35	1.24
--- TODO	2000/02/21 16:12:01	1.24.2.1
***************
*** 2,10 ****
--- 2,45 ----
  ===============================
  
+ -------------------------------------------------------------
+ This list pertains only to the 1.5.2p2 documentation release.
+ -------------------------------------------------------------
  
+ 
+ Python/C API
+ ------------
+ 
  * The "Very High Level Interface" in the API document has been
    requested; I guess it wouldn't hurt to fill in a bit there.  Request 
    by Albert Hofkamp <a.hofkamp@wtb.tue.nl>.  (Partly done.)
  
+ * Python/C API reference is missing PyArg_ParseTuple(),
+   PyArg_ParseTupleAndKeywords(), Py_BuildValue().  Information
+   requested by Greg Kochanski <gpk@bell-labs.com>.
+ 
+ * PyEval_EvalCode() must also be documented.  Ask Guido about source
+   comment: "Backward compatible interface".
+ 
+ * Break up the PyBufferProcs description so that the function types
+   are independently described.  Perhaps break the chapter into
+   sections for each of the *Procs interfaces.
+ 
+ * Make sure the reference count behavior of all the "exceptional"
+   cases in the C API is documented in the API manual, and mentioned in 
+   the extension manual if the function is mentioned.
+ 
+ * Ask Vladimir Marangozov <marangoz@python.inrialpes.fr> to document
+   the memory allocation APIs; this could be part of his proposed
+   cleanup.  ;)
+ 
+ * PyErr_SetInterrupt():  XXX comment about platform dependence should
+   be resolved, or explain the problem.  Ask Guido for explanation.
+ 
+ * PySys_SetArgv() impl. doesn't seem consistent in allowing 0/NULL for
+   the params; check w/ Guido.
+ 
+ Extending & Embedding
+ ---------------------
+ 
  * Describe implementing types in C, including use of the 'self'
    parameter to the method implementation function.  (Missing material
***************
*** 18,25 ****
  
  * Update the pickle documentation to describe all of the current
!   behavior; only a subset is described.  __reduce__, etc.
  
- * Update the code/codeop module documentation.
- 
  * In the indexes, some subitem entries are separated from the item
    entries by column- or page-breaks.  Reported by Lorenzo M. Catucci
--- 53,59 ----
  
  * Update the pickle documentation to describe all of the current
!   behavior; only a subset is described.  __reduce__, etc.  Partial
!   update submitted by Jim Kerr <jbkerr@sr.hp.com>.
  
  * In the indexes, some subitem entries are separated from the item
    entries by column- or page-breaks.  Reported by Lorenzo M. Catucci
***************
*** 29,48 ****
    change the index entries in the text.)
  
- * Fix problem with howto documents getting the last module synopsis
-   twice (in \localmoduletable) so we can get rid of the ugly 'uniq'
-   hack in tools/mkhowto.sh.  (Probably not worth the trouble of
-   fixing.)
- 
- * Figure out HTMLHelp generation for the Windows world.
- 
- * Straighten out random/whrandom.
- 
- 
- BEFORE NEXT PYTHON RELEASE, BUT NOT UNTIL THEN:
  
! * Document that the mode parameter to wave.open() may be omitted, and
!   how it is determined if omitted.  (Same of aifc, sunau open()
!   functions.)
  
! * Document that fpformat.NotANumber is a subclass of ValueError, has
!   the string that failed as the "exception value".
--- 63,71 ----
    change the index entries in the text.)
  
  
! Library Reference
! -----------------
  
! * Straighten out random/whrandom.  Things are generally in the right
!   place, but need to respond to comments in email from Jan Kim
!   <kim@mpiz-koeln.mpg.de>.



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 16:12:36 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 11:12:36 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api refcounts.dat,1.2,1.2.2.1
Message-ID: <200002211612.LAA06792@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p1/api

Modified Files:
      Tag: release152p1-patches
	refcounts.dat 
Log Message:

A couple of fixes.


Index: refcounts.dat
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/refcounts.dat,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** refcounts.dat	1999/10/20 16:03:38	1.2
--- refcounts.dat	2000/02/21 16:12:33	1.2.2.1
***************
*** 257,264 ****
  PyImport_ImportFrozenModule:char*:::
  
! PyImport_ImportModule:PyObject*::1:not sure...
  PyImport_ImportModule:char*:name::
  
! PyImport_ImportModuleEx:PyObject*::0:???
  PyImport_ImportModuleEx:char*:name::
  PyImport_ImportModuleEx:PyObject*:globals:0:???
--- 257,264 ----
  PyImport_ImportFrozenModule:char*:::
  
! PyImport_ImportModule:PyObject*::+1:
  PyImport_ImportModule:char*:name::
  
! PyImport_ImportModuleEx:PyObject*::+1:
  PyImport_ImportModuleEx:char*:name::
  PyImport_ImportModuleEx:PyObject*:globals:0:???
***************
*** 266,270 ****
  PyImport_ImportModuleEx:PyObject*:fromlist:0:???
  
! PyImport_ReloadModule:PyObject*::0:
  PyImport_ReloadModule:PyObject*:m:0:
  
--- 266,270 ----
  PyImport_ImportModuleEx:PyObject*:fromlist:0:???
  
! PyImport_ReloadModule:PyObject*::+1:
  PyImport_ReloadModule:PyObject*:m:0:
  



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 16:19:46 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 11:19:46 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib internet.tex,1.2,1.2.4.1 libsocket.tex,1.39.2.2,1.39.2.3
Message-ID: <200002211619.LAA06831@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	internet.tex libsocket.tex 
Log Message:

Update the platform dependence notes regarding the socket module; this is
supported on more platforms than Unix!  Based on comments from 
Jack Jansen <jack@oratrix.nl>.


Index: internet.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/internet.tex,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -r1.2 -r1.2.4.1
*** internet.tex	1999/04/22 16:03:30	1.2
--- internet.tex	2000/02/21 16:19:43	1.2.4.1
***************
*** 7,13 ****
  The modules described in this chapter implement Internet protocols and 
  support for related technology.  They are all implemented in Python.
! Some of these modules require the presence of the system-dependent
! module \refmodule{socket}\refbimodindex{socket}, which is currently only
! fully supported on \UNIX{} and Windows NT.  Here is an overview:
  
  \localmoduletable
--- 7,13 ----
  The modules described in this chapter implement Internet protocols and 
  support for related technology.  They are all implemented in Python.
! Most of these modules require the presence of the system-dependent
! module \refmodule{socket}\refbimodindex{socket}, which is currently
! supported on most popular platforms.  Here is an overview:
  
  \localmoduletable

Index: libsocket.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libsocket.tex,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -C2 -r1.39.2.2 -r1.39.2.3
*** libsocket.tex	1999/09/16 15:52:19	1.39.2.2
--- libsocket.tex	2000/02/21 16:19:43	1.39.2.3
***************
*** 7,11 ****
  
  This module provides access to the BSD \emph{socket} interface.
! It is available on \UNIX{} systems that support this interface.
  
  For an introduction to socket programming (in C), see the following
--- 7,12 ----
  
  This module provides access to the BSD \emph{socket} interface.
! It is available on all modern \UNIX{} systems, Windows, MacOS, BeOS,
! OS/2, and probably additional platforms.
  
  For an introduction to socket programming (in C), see the following
***************
*** 14,20 ****
  Communication Tutorial}, by Samuel J.  Leffler et al, both in the
  \UNIX{} Programmer's Manual, Supplementary Documents 1 (sections PS1:7
! and PS1:8).  The \UNIX{} manual pages for the various socket-related
! system calls are also a valuable source of information on the details of
! socket semantics.
  
  The Python interface is a straightforward transliteration of the
--- 15,22 ----
  Communication Tutorial}, by Samuel J.  Leffler et al, both in the
  \UNIX{} Programmer's Manual, Supplementary Documents 1 (sections PS1:7
! and PS1:8).  The platform-specific reference material for the various
! socket-related system calls are also a valuable source of information
! on the details of socket semantics.  For \UNIX, refer to the manual
! pages; for Windows, see the WinSock (or Winsock 2) specification.
  
  The Python interface is a straightforward transliteration of the



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 16:21:24 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 11:21:24 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libundoc.tex,1.67.2.2,1.67.2.3
Message-ID: <200002211621.LAA06859@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libundoc.tex 
Log Message:

Add a note that the dircmp module will be obsolete in 1.6.


Index: libundoc.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libundoc.tex,v
retrieving revision 1.67.2.2
retrieving revision 1.67.2.3
diff -C2 -r1.67.2.2 -r1.67.2.3
*** libundoc.tex	1999/12/01 18:41:59	1.67.2.2
--- libundoc.tex	2000/02/21 16:21:21	1.67.2.3
***************
*** 39,43 ****
  \begin{description}
  \item[\module{dircmp}]
! --- class to build directory diff tools on (may become a demo or tool)
  
  \item[\module{bdb}]
--- 39,44 ----
  \begin{description}
  \item[\module{dircmp}]
! --- Class to build directory diff tools on (may become a demo or tool).
! \deprecated{1.6}{The \module{filecmp} module will replace \module{dircmp}.}
  
  \item[\module{bdb}]
***************
*** 78,82 ****
  
  \item[\module{sunaudio}]
! --- interpret sun audio headers (may become obsolete or a tool/demo)
  
  \item[\module{toaiff}]
--- 79,83 ----
  
  \item[\module{sunaudio}]
! --- Interpret Sun audio headers (may become obsolete or a tool/demo)
  
  \item[\module{toaiff}]



From guido@cnri.reston.va.us  Mon Feb 21 16:50:33 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 21 Feb 2000 11:50:33 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python errors.c,2.42,2.43
Message-ID: <200002211650.LAA02372@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory eric:/projects/python/develop/guido/src/Python

Modified Files:
	errors.c 
Log Message:
Mark pointed out a buglet in his patch: i < _sys_nerr isn't strong
enough, it could be negative.  Add i > 0 test.  (Not i >= 0; zero isn't
a valid error number.)


Index: errors.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/errors.c,v
retrieving revision 2.42
retrieving revision 2.43
diff -C2 -r2.42 -r2.43
*** errors.c	2000/02/17 15:19:15	2.42
--- errors.c	2000/02/21 16:50:31	2.43
***************
*** 309,313 ****
  		   a Win32 error code
  		*/
! 		if (i < _sys_nerr) {
  			s = _sys_errlist[i];
  		}
--- 309,313 ----
  		   a Win32 error code
  		*/
! 		if (i > 0 && i < _sys_nerr) {
  			s = _sys_errlist[i];
  		}



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 16:52:27 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 11:52:27 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.9,1.56.2.10
Message-ID: <200002211652.LAA07038@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p1/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Lots of minor markup adjustments to keep things clean.  Sought &
adjusted markup that can make LaTeX2HTML drop a space in the output.

Added explanation of where to find the installed header files for Unix 
& Windows.

Added a paragraph at the top of the high-level functions section
explaining the 'start' parameter, telling what the useful values are
and pointing to the specific explanations of each at the end of the
section.

Added a short section to the "Exception Handling" chapter describing
the deprecation of string exceptions and removal of the -X option in
future releases of the interpreter.

Filled in a few missing descriptions throughout the document, and
filled out a bunch more that were incomplete; many descriptions now
sport slick new exception information.

Re-structured the descripition of the API for complex numbers, clearly 
separating the C-type from the Python-type portions.

Commented out the "Debugging" chapter since it hasn't been written.


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.9
retrieving revision 1.56.2.10
diff -C2 -r1.56.2.9 -r1.56.2.10
*** api.tex	2000/02/16 16:07:43	1.56.2.9
--- api.tex	2000/02/21 16:52:23	1.56.2.10
***************
*** 21,25 ****
  
  \noindent
! This manual documents the API used by \C{} (or \Cpp{}) programmers who
  want to write extension modules or embed Python.  It is a companion to
  \emph{Extending and Embedding the Python Interpreter}, which describes
--- 21,25 ----
  
  \noindent
! This manual documents the API used by C (or \Cpp{}) programmers who
  want to write extension modules or embed Python.  It is a companion to
[...1602 lines suppressed...]
! XXX Explain Py_DEBUG, Py_TRACE_REFS, Py_REF_DEBUG.
  
  
--- 3377,3392 ----
  characters may be multi-byte characters. This implies that a buffer
  size of \var{N} does not mean there are \var{N} characters present.
  \end{ctypedesc}
  
  DL_IMPORT
  
  Py*_Check
  
+ _Py_NoneStruct
  
  
! % \chapter{Debugging \label{debugging}}
! %
! % XXX Explain Py_DEBUG, Py_TRACE_REFS, Py_REF_DEBUG.
  
  



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:05:12 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:05:12 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/perl python.perl,1.65.2.4,1.65.2.5
Message-ID: <200002211705.MAA07166@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/perl
In directory weyr:/home/fdrake/projects/python/Doc-152p1/perl

Modified Files:
      Tag: release152p1-patches
	python.perl 
Log Message:

Adjust result for \file to match what CSS-aware browsers do as much as 
possible for non-CSS browsers; this is so users get the same
presentation as much as possible.

make_mod_index_entry():  Fix broken generation of Module Index data.


Index: python.perl
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.65.2.4
retrieving revision 1.65.2.5
diff -C2 -r1.65.2.4 -r1.65.2.5
*** python.perl	2000/02/16 17:13:58	1.65.2.4
--- python.perl	2000/02/21 17:05:09	1.65.2.5
***************
*** 160,166 ****
      return use_italics(@_); }
  sub do_cmd_file{
!     return use_wrappers(@_[0], '<tt class="file">', '</tt>'); }
  sub do_cmd_filenq{
!     return use_wrappers(@_[0], '<tt class="file">', '</tt>'); }
  sub do_cmd_samp{
      return use_wrappers(@_[0], '"<tt class="samp">', '</tt>"'); }
--- 160,168 ----
      return use_italics(@_); }
  sub do_cmd_file{
!     return use_wrappers(@_[0],
!                         '<font class="file" face="sans-serif">',
!                         '</font>'); }
  sub do_cmd_filenq{
!     return do_cmd_file(@_[0]); }
  sub do_cmd_samp{
      return use_wrappers(@_[0], '"<tt class="samp">', '</tt>"'); }
***************
*** 482,486 ****
      if ($define eq 'DEF') {
  	# add to the module index
! 	my($nstr,$garbage) = split / /, $str, 2;
  	$Modules{$nstr} .= $ahref;
      }
--- 484,489 ----
      if ($define eq 'DEF') {
  	# add to the module index
!         $str =~ /(<tt.*<\/tt>)/;
!         my $nstr = $1;
  	$Modules{$nstr} .= $ahref;
      }



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:20:19 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:20:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools cklatex,NONE,1.1
Message-ID: <200002211720.MAA07254@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tools
In directory weyr:/home/fdrake/projects/python/Doc/tools

Added Files:
	cklatex 
Log Message:

Script to help locate markup that LaTeX2HTML has a problem with.





From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:21:21 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:21:21 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tut tut.tex,1.100.2.3,1.100.2.4
Message-ID: <200002211721.MAA07284@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tut
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tut

Modified Files:
      Tag: release152p1-patches
	tut.tex 
Log Message:

Sought & adjusted markup that can make LaTeX2HTML drop a space in the
output.


Index: tut.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tut/tut.tex,v
retrieving revision 1.100.2.3
retrieving revision 1.100.2.4
diff -C2 -r1.100.2.3 -r1.100.2.4
*** tut.tex	2000/02/17 18:02:39	1.100.2.3
--- tut.tex	2000/02/21 17:21:18	1.100.2.4
***************
*** 159,166 ****
  \section{Invoking the Interpreter \label{invoking}}
  
! The Python interpreter is usually installed as \file{/usr/local/bin/python}
! on those machines where it is available; putting \file{/usr/local/bin} in
! your \UNIX{} shell's search path makes it possible to start it by
! typing the command
  
  \begin{verbatim}
--- 159,166 ----
  \section{Invoking the Interpreter \label{invoking}}
  
! The Python interpreter is usually installed as
! \file{/usr/local/bin/python} on those machines where it is available;
! putting \file{/usr/local/bin} in your \UNIX{} shell's search path
! makes it possible to start it by typing the command
  
  \begin{verbatim}
***************
*** 309,314 ****
  can do this by setting an environment variable named
  \envvar{PYTHONSTARTUP} to the name of a file containing your start-up
! commands.  This is similar to the \file{.profile} feature of the \UNIX{}
! shells.
  
  This file is only read in interactive sessions, not when Python reads
--- 309,314 ----
  can do this by setting an environment variable named
  \envvar{PYTHONSTARTUP} to the name of a file containing your start-up
! commands.  This is similar to the \file{.profile} feature of the
! \UNIX{} shells.
  
  This file is only read in interactive sessions, not when Python reads
***************
*** 376,382 ****
  The interpreter acts as a simple calculator: you can type an
  expression at it and it will write the value.  Expression syntax is
! straightforward: the operators \code{+}, \code{-}, \code{*} and \code{/}
! work just like in most other languages (e.g., Pascal or C); parentheses
! can be used for grouping.  For example:
  
  \begin{verbatim}
--- 376,382 ----
  The interpreter acts as a simple calculator: you can type an
  expression at it and it will write the value.  Expression syntax is
! straightforward: the operators \code{+}, \code{-}, \code{*} and
! \code{/} work just like in most other languages (e.g., Pascal or C);
! parentheses can be used for grouping.  For example:
  
  \begin{verbatim}
***************
*** 634,639 ****
  \end{verbatim}
  
! Here's a useful invariant of slice operations: \code{s[:i] + s[i:]}
! equals \code{s}.
  
  \begin{verbatim}
--- 634,639 ----
  \end{verbatim}
  
! Here's a useful invariant of slice operations:
! \code{s[:i] + s[i:]} equals \code{s}.
  
  \begin{verbatim}
***************
*** 909,914 ****
  \section{\keyword{if} Statements \label{if}}
  
! Perhaps the most well-known statement type is the \keyword{if}
! statement.  For example:
  
  \begin{verbatim}
--- 909,914 ----
  \section{\keyword{if} Statements \label{if}}
  
! Perhaps the most well-known statement type is the
! \keyword{if} statement.  For example:
  
  \begin{verbatim}
***************
*** 926,937 ****
  \end{verbatim}
  
! There can be zero or more \keyword{elif} parts, and the \keyword{else}
! part is optional.  The keyword `\keyword{elif}' is short for `else
! if', and is useful to avoid excessive indentation.  An
! \keyword{if} \ldots\ \keyword{elif} \ldots\ \keyword{elif}
! \ldots\ sequence is a substitute for the  \emph{switch} or
! %    ^^^^
  %    Weird spacings happen here if the wrapping of the source text
  %    gets changed in the wrong way.
  \emph{case} statements found in other languages.
  
--- 926,936 ----
  \end{verbatim}
  
! There can be zero or more \keyword{elif} parts, and the
! \keyword{else} part is optional.  The keyword `\keyword{elif}' is
! short for `else if', and is useful to avoid excessive indentation.  An 
! \keyword{if} \ldots\ \keyword{elif} \ldots\ \keyword{elif} \ldots\ sequence
  %    Weird spacings happen here if the wrapping of the source text
  %    gets changed in the wrong way.
+ is a substitute for the  \emph{switch} or
  \emph{case} statements found in other languages.
  
***************
*** 943,950 ****
  iterating over an arithmetic progression of numbers (like in Pascal),
  or giving the user the ability to define both the iteration step and
! halting condition (as C), Python's \keyword{for}\stindex{for}
! statement iterates over the items of any sequence (e.g., a list or a
! string), in the order that they appear in the sequence.  For example
! (no pun intended):
  % One suggestion was to give a real C example here, but that may only
  % serve to confuse non-C programmers.
--- 942,949 ----
  iterating over an arithmetic progression of numbers (like in Pascal),
  or giving the user the ability to define both the iteration step and
! halting condition (as C), Python's
! \keyword{for}\stindex{for} statement iterates over the items of any
! sequence (e.g., a list or a string), in the order that they appear in
! the sequence.  For example (no pun intended):
  % One suggestion was to give a real C example here, but that may only
  % serve to confuse non-C programmers.
***************
*** 1002,1007 ****
  \end{verbatim}
  
! To iterate over the indices of a sequence, combine \function{range()}
! and \function{len()} as follows:
  
  \begin{verbatim}
--- 1001,1006 ----
  \end{verbatim}
  
! To iterate over the indices of a sequence, combine
! \function{range()} and \function{len()} as follows:
  
  \begin{verbatim}
***************
*** 1017,1020 ****
--- 1016,1020 ----
  \end{verbatim}
  
+ 
  \section{\keyword{break} and \keyword{continue} Statements, and
           \keyword{else} Clauses on Loops
***************
*** 1315,1323 ****
  present, it receives a dictionary containing all keyword arguments
  whose keyword doesn't correspond to a formal parameter.  This may be
! combined with a formal parameter of the form \code{*\var{name}}
! (described in the next subsection) which receives a tuple containing
! the positional arguments beyond the formal parameter list.
! (\code{*\var{name}} must occur before \code{**\var{name}}.)  For
! example, if we define a function like this:
  
  \begin{verbatim}
--- 1315,1323 ----
  present, it receives a dictionary containing all keyword arguments
  whose keyword doesn't correspond to a formal parameter.  This may be
! combined with a formal parameter of the form
! \code{*\var{name}} (described in the next subsection) which receives a
! tuple containing the positional arguments beyond the formal parameter
! list.  (\code{*\var{name}} must occur before \code{**\var{name}}.)
! For example, if we define a function like this:
  
  \begin{verbatim}
***************
*** 1389,1394 ****
  There are emerging conventions about the content and formatting of
  documentation strings.
! \index{docstrings}
! \index{documentation strings}
  \index{strings, documentation}
  
--- 1389,1393 ----
  There are emerging conventions about the content and formatting of
  documentation strings.
! \index{docstrings}\index{documentation strings}
  \index{strings, documentation}
  
***************
*** 1714,1722 ****
  value using a non-existent key.
  
! The \code{keys()} method of a dictionary object returns a list of all the
! keys used in the dictionary, in random order (if you want it sorted,
! just apply the \code{sort()} method to the list of keys).  To check
! whether a single key is in the dictionary, use the \code{has_key()}
! method of the dictionary.
  
  Here is a small example using a dictionary:
--- 1713,1721 ----
  value using a non-existent key.
  
! The \code{keys()} method of a dictionary object returns a list of all
! the keys used in the dictionary, in random order (if you want it
! sorted, just apply the \code{sort()} method to the list of keys).  To
! check whether a single key is in the dictionary, use the
! \code{has_key()} method of the dictionary.
  
  Here is a small example using a dictionary:
***************
*** 1902,1907 ****
  These statements are intended to initialize the module.
  They are executed only the
! \emph{first}
! time the module is imported somewhere.\footnote{
          In fact function definitions are also `statements' that are
          `executed'; the execution enters the function name in the
--- 1901,1905 ----
  These statements are intended to initialize the module.
  They are executed only the
! \emph{first} time the module is imported somewhere.\footnote{
          In fact function definitions are also `statements' that are
          `executed'; the execution enters the function name in the
***************
*** 1980,1991 ****
  \file{.pyc} file is ignored if these don't match.
  
! Normally, you don't need to do anything to create the \file{spam.pyc} file.
! Whenever \file{spam.py} is successfully compiled, an attempt is made to
! write the compiled version to \file{spam.pyc}.  It is not an error if
! this attempt fails; if for any reason the file is not written
! completely, the resulting \file{spam.pyc} file will be recognized as
! invalid and thus ignored later.  The contents of the \file{spam.pyc}
! file are platform independent, so a Python module directory can be
! shared by machines of different architectures.
  
  Some tips for experts:
--- 1978,1990 ----
  \file{.pyc} file is ignored if these don't match.
  
! Normally, you don't need to do anything to create the
! \file{spam.pyc} file.  Whenever \file{spam.py} is successfully
! compiled, an attempt is made to write the compiled version to
! \file{spam.pyc}.  It is not an error if this attempt fails; if for any
! reason the file is not written completely, the resulting
! \file{spam.pyc} file will be recognized as invalid and thus ignored
! later.  The contents of the \file{spam.pyc} file are platform
! independent, so a Python module directory can be shared by machines of
! different architectures.
  
  Some tips for experts:
***************
*** 2014,2021 ****
  
  \item
! A program doesn't run any faster when it is read from a
! \file{.pyc} or \file{.pyo} file than when it is read from a \file{.py}
! file; the only thing that's faster about \file{.pyc} or \file{.pyo}
! files is the speed with which they are loaded.
  
  \item
--- 2013,2020 ----
  
  \item
! A program doesn't run any faster when it is read from a \file{.pyc} or
! \file{.pyo} file than when it is read from a \file{.py} file; the only
! thing that's faster about \file{.pyc} or \file{.pyo} files is the
! speed with which they are loaded.
  
  \item
***************
*** 2224,2233 ****
  
  Note that when using \code{from \var{package} import \var{item}}, the
! item can be either a submodule (or subpackage) of the package, or some
  other name defined in the package, like a function, class or
  variable.  The \code{import} statement first tests whether the item is
  defined in the package; if not, it assumes it is a module and attempts
! to load it.  If it fails to find it, an \exception{ImportError}
! exception is raised.
  
  Contrarily, when using syntax like \code{import
--- 2223,2232 ----
  
  Note that when using \code{from \var{package} import \var{item}}, the
! item can be either a submodule (or subpackage) of the package, or some 
  other name defined in the package, like a function, class or
  variable.  The \code{import} statement first tests whether the item is
  defined in the package; if not, it assumes it is a module and attempts
! to load it.  If it fails to find it, an
! \exception{ImportError} exception is raised.
  
  Contrarily, when using syntax like \code{import
***************
*** 2254,2265 ****
  The only solution is for the package author to provide an explicit
  index of the package.  The import statement uses the following
! convention: if a package's \file{__init__.py} code defines a list named
! \code{__all__}, it is taken to be the list of module names that should
! be imported when \code{from \var{package} import *} is encountered.
! It is up to the package author to keep this list up-to-date when a new
! version of the package is released.  Package authors may also decide
! not to support it, if they don't see a use for importing * from their
! package.  For example, the file \file{Sounds/Effects/__init__.py}
! could contain the following code:
  
  \begin{verbatim}
--- 2253,2264 ----
  The only solution is for the package author to provide an explicit
  index of the package.  The import statement uses the following
! convention: if a package's \file{__init__.py} code defines a list
! named \code{__all__}, it is taken to be the list of module names that
! should be imported when \code{from \var{package} import *} is
! encountered.  It is up to the package author to keep this list
! up-to-date when a new version of the package is released.  Package
! authors may also decide not to support it, if they don't see a use for
! importing * from their package.  For example, the file
! \file{Sounds/Effects/__init__.py} could contain the following code:
  
  \begin{verbatim}
***************
*** 2288,2294 ****
  
  In this example, the echo and surround modules are imported in the
! current namespace because they are defined in the \module{Sound.Effects}
! package when the \code{from...import} statement is executed.  (This also
! works when \code{__all__} is defined.)
  
  Note that in general the practicing of importing * from a module or
--- 2287,2293 ----
  
  In this example, the echo and surround modules are imported in the
! current namespace because they are defined in the
! \module{Sound.Effects} package when the \code{from...import} statement
! is executed.  (This also works when \code{__all__} is defined.)
  
  Note that in general the practicing of importing * from a module or
***************
*** 2316,2324 ****
  with the given name.
  
! When packages are structured into subpackages (as with the \module{Sound}
! package in the example), there's no shortcut to refer to submodules of
! sibling packages - the full name of the subpackage must be used.  For
! example, if the module \module{Sound.Filters.vocoder} needs to use the \module{echo}
! module in the \module{Sound.Effects} package, it can use \code{from
  Sound.Effects import echo}.
  
--- 2315,2324 ----
  with the given name.
  
! When packages are structured into subpackages (as with the
! \module{Sound} package in the example), there's no shortcut to refer
! to submodules of sibling packages - the full name of the subpackage
! must be used.  For example, if the module
! \module{Sound.Filters.vocoder} needs to use the \module{echo} module
! in the \module{Sound.Effects} package, it can use \code{from
  Sound.Effects import echo}.
  
***************
*** 2461,2465 ****
  
  \begin{verbatim}
! >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678}
  >>> for name, phone in table.items():
  ...     print '%-10s ==> %10d' % (name, phone)
--- 2461,2465 ----
  
  \begin{verbatim}
! >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 7678}
  >>> for name, phone in table.items():
  ...     print '%-10s ==> %10d' % (name, phone)
***************
*** 2584,2592 ****
  \samp{f.seek(\var{offset}, \var{from_what})}.  The position is
  computed from adding \var{offset} to a reference point; the reference
! point is selected by the \var{from_what} argument.  A \var{from_what}
! value of 0 measures from the beginning of the file, 1 uses the current
! file position, and 2 uses the end of the file as the reference point.
! \var{from_what} can be omitted and defaults to 0, using the beginning
! of the file as the reference point.
  
  \begin{verbatim}
--- 2584,2592 ----
  \samp{f.seek(\var{offset}, \var{from_what})}.  The position is
  computed from adding \var{offset} to a reference point; the reference
! point is selected by the \var{from_what} argument.  A
! \var{from_what} value of 0 measures from the beginning of the file, 1
! uses the current file position, and 2 uses the end of the file as the
! reference point.  \var{from_what} can be omitted and defaults to 0,
! using the beginning of the file as the reference point.
  
  \begin{verbatim}
***************
*** 2613,2619 ****
  \end{verbatim}
  
! File objects have some additional methods, such as \method{isatty()}
! and \method{truncate()} which are less frequently used; consult the
! Library Reference for a complete guide to file objects.
  
  \subsection{The \module{pickle} Module \label{pickle}}
--- 2613,2620 ----
  \end{verbatim}
  
! File objects have some additional methods, such as
! \method{isatty()} and \method{truncate()} which are less frequently
! used; consult the Library Reference for a complete guide to file
! objects.
  
  \subsection{The \module{pickle} Module \label{pickle}}
***************
*** 2657,2666 ****
  complete documentation for \module{pickle} in the Library Reference.)
  
! \module{pickle} is the standard way to make Python objects which can be
! stored and reused by other programs or by a future invocation of the
! same program; the technical term for this is a \dfn{persistent}
! object.  Because \module{pickle} is so widely used, many authors who
! write Python extensions take care to ensure that new data types such
! as matrices can be properly pickled and unpickled.
  
  
--- 2658,2667 ----
  complete documentation for \module{pickle} in the Library Reference.)
  
! \module{pickle} is the standard way to make Python objects which can
! be stored and reused by other programs or by a future invocation of
! the same program; the technical term for this is a
! \dfn{persistent} object.  Because \module{pickle} is so widely used,
! many authors who write Python extensions take care to ensure that new
! data types such as matrices can be properly pickled and unpickled.
  
  
***************
*** 2670,2675 ****
  Until now error messages haven't been more than mentioned, but if you
  have tried out the examples you have probably seen some.  There are
! (at least) two distinguishable kinds of errors: \emph{syntax errors}
! and \emph{exceptions}.
  
  \section{Syntax Errors \label{syntaxErrors}}
--- 2671,2676 ----
  Until now error messages haven't been more than mentioned, but if you
  have tried out the examples you have probably seen some.  There are
! (at least) two distinguishable kinds of errors:
! \emph{syntax errors} and \emph{exceptions}.
  
  \section{Syntax Errors \label{syntaxErrors}}
***************
*** 2687,2697 ****
  
  The parser repeats the offending line and displays a little `arrow'
! pointing at the earliest point in the line where the error was detected.
! The error is caused by (or at least detected at) the token
! \emph{preceding}
! the arrow: in the example, the error is detected at the keyword
! \keyword{print}, since a colon (\character{:}) is missing before it.
! File name and line number are printed so you know where to look in case
! the input came from a script.
  
  \section{Exceptions \label{exceptions}}
--- 2688,2697 ----
  
  The parser repeats the offending line and displays a little `arrow'
! pointing at the earliest point in the line where the error was
! detected.  The error is caused by (or at least detected at) the token
! \emph{preceding} the arrow: in the example, the error is detected at
! the keyword \keyword{print}, since a colon (\character{:}) is missing
! before it.  File name and line number are printed so you know where to
! look in case the input came from a script.
  
  \section{Exceptions \label{exceptions}}
***************
*** 2722,2728 ****
  Exceptions come in different types, and the type is printed as part of
  the message: the types in the example are
! \exception{ZeroDivisionError},
! \exception{NameError}
! and
  \exception{TypeError}.
  The string printed as the exception type is the name of the built-in
--- 2722,2726 ----
  Exceptions come in different types, and the type is printed as part of
  the message: the types in the example are
! \exception{ZeroDivisionError}, \exception{NameError} and
  \exception{TypeError}.
  The string printed as the exception type is the name of the built-in
***************
*** 2977,2982 ****
  in Smalltalk, classes themselves are objects, albeit in the wider
  sense of the word: in Python, all data types are objects.  This
! provides semantics for importing and renaming.  But, just like in \Cpp{}
! or Modula-3, built-in types cannot be used as base classes for
  extension by the user.  Also, like in \Cpp{} but unlike in Modula-3, most
  built-in operators with special syntax (arithmetic operators,
--- 2975,2980 ----
  in Smalltalk, classes themselves are objects, albeit in the wider
  sense of the word: in Python, all data types are objects.  This
! provides semantics for importing and renaming.  But, just like in
! \Cpp{} or Modula-3, built-in types cannot be used as base classes for
  extension by the user.  Also, like in \Cpp{} but unlike in Modula-3, most
  built-in operators with special syntax (arithmetic operators,
***************
*** 3137,3144 ****
  \end{verbatim}
  
! Class definitions, like function definitions (\keyword{def}
! statements) must be executed before they have any effect.  (You could
! conceivably place a class definition in a branch of an \keyword{if}
! statement, or inside a function.)
  
  In practice, the statements inside a class definition will usually be
--- 3135,3142 ----
  \end{verbatim}
  
! Class definitions, like function definitions
! (\keyword{def} statements) must be executed before they have any
! effect.  (You could conceivably place a class definition in a branch
! of an \keyword{if} statement, or inside a function.)
  
  In practice, the statements inside a class definition will usually be
***************
*** 3272,3278 ****
  \code{MyClass.f} is a function, but \code{x.i} is not, since
  \code{MyClass.i} is not.  But \code{x.f} is not the same thing as
! \code{MyClass.f} --- it is a \emph{method object}, not a function
! object.%
! \obindex{method}
  
  
--- 3270,3275 ----
  \code{MyClass.f} is a function, but \code{x.i} is not, since
  \code{MyClass.i} is not.  But \code{x.f} is not the same thing as
! \code{MyClass.f} --- it is a \obindex{method}\emph{method object}, not
! a function object.
  
  
***************
*** 3634,3639 ****
  \end{verbatim}
  
! In the first form, \code{instance} must be an instance of \class{Class}
! or of a class derived from it.  The second form is a shorthand for
  
  \begin{verbatim}
--- 3631,3637 ----
  \end{verbatim}
  
! In the first form, \code{instance} must be an instance of
! \class{Class} or of a class derived from it.  The second form is a
! shorthand for:
  
  \begin{verbatim}
***************
*** 3815,3822 ****
  Automatic completion of variable and module names is optionally
  available.  To enable it in the interpreter's interactive mode, add
! the following to your \file{\$HOME/.pythonrc.py} file:% $ <- bow to font-lock
  \indexii{.pythonrc.py}{file}
! \refstmodindex{rlcompleter}
! \refbimodindex{readline}
  
  \begin{verbatim}
--- 3813,3819 ----
  Automatic completion of variable and module names is optionally
  available.  To enable it in the interpreter's interactive mode, add
! the following to your \file{\$HOME/.pythonrc.py} file:%
  \indexii{.pythonrc.py}{file}
! \refstmodindex{rlcompleter}\refbimodindex{readline}
  
  \begin{verbatim}



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:34:27 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:34:27 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc TODO,1.24.2.1,1.24.2.2
Message-ID: <200002211734.MAA07691@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	TODO 
Log Message:

Removed an item that was strictly cosmetic.


Index: TODO
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/TODO,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C2 -r1.24.2.1 -r1.24.2.2
*** TODO	2000/02/21 16:12:01	1.24.2.1
--- TODO	2000/02/21 17:34:24	1.24.2.2
***************
*** 56,66 ****
    update submitted by Jim Kerr <jbkerr@sr.hp.com>.
  
- * In the indexes, some subitem entries are separated from the item
-   entries by column- or page-breaks.  Reported by Lorenzo M. Catucci
-   <lorenzo@argon.roma2.infn.it>.  This one will be hard; probably not
-   really worth the pain.  (Only an issue at all when a header-letter
-   and the first index entry get separated -- can change as soon as we
-   change the index entries in the text.)
- 
  
  Library Reference
--- 56,59 ----



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:48:43 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:48:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc Makefile,1.190.2.2,1.190.2.3
Message-ID: <200002211748.MAA07892@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	Makefile 
Log Message:

Remove the source package from the distfiles target; this won't be
used for the 1.5.2p2 release.


Index: Makefile
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/Makefile,v
retrieving revision 1.190.2.2
retrieving revision 1.190.2.3
diff -C2 -r1.190.2.2 -r1.190.2.3
*** Makefile	2000/02/17 17:37:06	1.190.2.2
--- Makefile	2000/02/21 17:48:40	1.190.2.3
***************
*** 283,287 ****
  
  distfiles:	tarballs zips bzips
- 	$(TOOLSDIR)/mksourcepkg --all $(RELEASE)
  
  
--- 283,286 ----



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:49:28 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:49:28 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/perl l2hinit.perl,1.38.4.2,1.38.4.3
Message-ID: <200002211749.MAA07919@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/perl
In directory weyr:/home/fdrake/projects/python/Doc-152p1/perl

Modified Files:
      Tag: release152p1-patches
	l2hinit.perl 
Log Message:

Don't break pages at the subsubsection level; stop at subsections.


Index: l2hinit.perl
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/perl/l2hinit.perl,v
retrieving revision 1.38.4.2
retrieving revision 1.38.4.3
diff -C2 -r1.38.4.2 -r1.38.4.3
*** l2hinit.perl	1999/11/12 19:51:42	1.38.4.2
--- l2hinit.perl	2000/02/21 17:49:26	1.38.4.3
***************
*** 17,20 ****
--- 17,21 ----
  
  $MAX_LINK_DEPTH = 2;
+ $MAX_SPLIT_DEPTH = 5;      # split at subsections but not sub-subsections
  $ADDRESS = '';
  



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:59:50 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:59:50 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python ceval.c,2.166,2.167
Message-ID: <200002211759.MAA08122@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory weyr:/home/fdrake/projects/python/Python

Modified Files:
	ceval.c 
Log Message:

Remove comment that Guido agree's doesn't make sense:
PyEval_EvalCode() is *not* a "backward compatible interface", it's the 
one to use!


Index: ceval.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/ceval.c,v
retrieving revision 2.166
retrieving revision 2.167
diff -C2 -r2.166 -r2.167
*** ceval.c	2000/01/12 22:45:54	2.166
--- ceval.c	2000/02/21 17:59:48	2.167
***************
*** 314,319 ****
  
  
- /* Backward compatible interface */
- 
  PyObject *
  PyEval_EvalCode(co, globals, locals)
--- 314,317 ----



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 18:04:43 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 13:04:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.10,1.56.2.11
Message-ID: <200002211804.NAA08173@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p1/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Per Guido's suggestion, mark PyFile_SoftSpace() as for internal use
only.


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.10
retrieving revision 1.56.2.11
diff -C2 -r1.56.2.10 -r1.56.2.11
*** api.tex	2000/02/21 16:52:23	1.56.2.10
--- api.tex	2000/02/21 18:04:40	1.56.2.11
***************
*** 2544,2547 ****
--- 2544,2548 ----
  
  \begin{cfuncdesc}{int}{PyFile_SoftSpace}{PyObject *p, int newflag}
+ This function exists for internal use by the interpreter.
  Sets the \member{softspace} attribute of \var{p} to \var{newflag}.
  Returns the previous value.  \var{p} does not have to be a file object 



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 18:05:41 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 13:05:41 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc TODO,1.24.2.2,1.24.2.3
Message-ID: <200002211805.NAA08192@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	TODO 
Log Message:

Remove note about weird comment in PyEval_EvalCode() source.


Index: TODO
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/TODO,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -C2 -r1.24.2.2 -r1.24.2.3
*** TODO	2000/02/21 17:34:24	1.24.2.2
--- TODO	2000/02/21 18:05:39	1.24.2.3
***************
*** 18,23 ****
    requested by Greg Kochanski <gpk@bell-labs.com>.
  
! * PyEval_EvalCode() must also be documented.  Ask Guido about source
!   comment: "Backward compatible interface".
  
  * Break up the PyBufferProcs description so that the function types
--- 18,22 ----
    requested by Greg Kochanski <gpk@bell-labs.com>.
  
! * PyEval_EvalCode() must also be documented.
  
  * Break up the PyBufferProcs description so that the function types



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 18:10:12 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 13:10:12 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.11,1.56.2.12
Message-ID: <200002211810.NAA08244@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p1/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Wrap up a couple of nits for PyErr_SetInterrupt().


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.11
retrieving revision 1.56.2.12
diff -C2 -r1.56.2.11 -r1.56.2.12
*** api.tex	2000/02/21 18:04:40	1.56.2.11
--- api.tex	2000/02/21 18:10:09	1.56.2.12
***************
*** 879,886 ****
  
  \begin{cfuncdesc}{void}{PyErr_SetInterrupt}{}
! This function is obsolete (XXX or platform dependent?).  It simulates
  the effect of a \constant{SIGINT} signal arriving --- the next time
  \cfunction{PyErr_CheckSignals()} is called,
  \exception{KeyboadInterrupt} will be raised.
  \end{cfuncdesc}
  
--- 879,887 ----
  
  \begin{cfuncdesc}{void}{PyErr_SetInterrupt}{}
! This function is obsolete.  It simulates
  the effect of a \constant{SIGINT} signal arriving --- the next time
  \cfunction{PyErr_CheckSignals()} is called,
  \exception{KeyboadInterrupt} will be raised.
+ It may be called without holding the interpreter lock.
  \end{cfuncdesc}
  



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 18:19:09 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 13:19:09 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules parsermodule.c,2.35,2.36
Message-ID: <200002211819.NAA08321@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory weyr:/home/fdrake/projects/python/Modules

Modified Files:
	parsermodule.c 
Log Message:

What used to be tp_xxx4 is now tp_flags; set it to Py_TPFLAGS_DEFAULT.


Index: parsermodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/parsermodule.c,v
retrieving revision 2.35
retrieving revision 2.36
diff -C2 -r2.35 -r2.36
*** parsermodule.c	1999/09/20 22:32:18	2.35
--- parsermodule.c	2000/02/21 18:19:06	2.36
***************
*** 233,238 ****
      0,					/* tp_as_buffer		*/
  
!     /* Space for future expansion */
!     0,					/* tp_xxx4		*/
  
      /* __doc__ */
--- 233,237 ----
      0,					/* tp_as_buffer		*/
  
!     Py_TPFLAGS_DEFAULT,			/* tp_flags		*/
  
      /* __doc__ */



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 21:04:14 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 16:04:14 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc TODO,1.24.2.3,1.24.2.4
Message-ID: <200002212104.QAA08854@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	TODO 
Log Message:

Note that Py_AddPendingCall() is undocumented.


Index: TODO
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/TODO,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -C2 -r1.24.2.3 -r1.24.2.4
*** TODO	2000/02/21 18:05:39	1.24.2.3
--- TODO	2000/02/21 21:04:11	1.24.2.4
***************
*** 18,22 ****
    requested by Greg Kochanski <gpk@bell-labs.com>.
  
! * PyEval_EvalCode() must also be documented.
  
  * Break up the PyBufferProcs description so that the function types
--- 18,22 ----
    requested by Greg Kochanski <gpk@bell-labs.com>.
  
! * PyEval_EvalCode(), Py_AddPendingCall() must also be documented.
  
  * Break up the PyBufferProcs description so that the function types



From jhylton@cnri.reston.va.us  Mon Feb 21 22:46:03 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Mon, 21 Feb 2000 17:46:03 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler misc.py,1.4,1.5 pyassem.py,1.5,1.6
Message-ID: <200002212246.RAA01846@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	misc.py pyassem.py 
Log Message:
satisfy the tabnanny (thanks to MH for noticing the problem)


Index: misc.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/misc.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** misc.py	2000/02/16 00:49:47	1.4
--- misc.py	2000/02/21 22:46:00	1.5
***************
*** 12,24 ****
  class Set:
      def __init__(self):
! 	self.elts = {}
      def __len__(self):
          return len(self.elts)
      def add(self, elt):
! 	self.elts[elt] = elt
      def items(self):
! 	return self.elts.keys()
      def has_elt(self, elt):
! 	return self.elts.has_key(elt)
      def remove(self, elt):
          del self.elts[elt]
--- 12,24 ----
  class Set:
      def __init__(self):
!         self.elts = {}
      def __len__(self):
          return len(self.elts)
      def add(self, elt):
!         self.elts[elt] = elt
      def items(self):
!         return self.elts.keys()
      def has_elt(self, elt):
!         return self.elts.has_key(elt)
      def remove(self, elt):
          del self.elts[elt]
***************
*** 26,35 ****
  class Stack:
      def __init__(self):
! 	self.stack = []
! 	self.pop = self.stack.pop
      def __len__(self):
          return len(self.stack)
      def push(self, elt):
! 	self.stack.append(elt)
      def top(self):
! 	return self.stack[-1]
--- 26,35 ----
  class Stack:
      def __init__(self):
!         self.stack = []
!         self.pop = self.stack.pop
      def __len__(self):
          return len(self.stack)
      def push(self, elt):
!         self.stack.append(elt)
      def top(self):
!         return self.stack[-1]

Index: pyassem.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/pyassem.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pyassem.py	2000/02/17 22:58:54	1.5
--- pyassem.py	2000/02/21 22:46:00	1.6
***************
*** 61,65 ****
                   docstring=None):
          # XXX why is the default value for flags 3?
! 	self.insts = []
          # used by makeCodeObject
          self._getArgCount(args)
--- 61,65 ----
                   docstring=None):
          # XXX why is the default value for flags 3?
!         self.insts = []
          # used by makeCodeObject
          self._getArgCount(args)
***************
*** 108,115 ****
  
      def getCurInst(self):
! 	return len(self.insts)
  
      def getNextInst(self):
! 	return len(self.insts) + 1
  
      def dump(self, io=sys.stdout):
--- 108,115 ----
  
      def getCurInst(self):
!         return len(self.insts)
  
      def getNextInst(self):
!         return len(self.insts) + 1
  
      def dump(self, io=sys.stdout):
***************
*** 163,167 ****
          if self.flags & CO_VARKEYWORDS:
              self.argcount = self.argcount - 1
! 	stacksize = findDepth(self.insts)
          try:
              co = new.code(self.argcount, nlocals, stacksize,
--- 163,167 ----
          if self.flags & CO_VARKEYWORDS:
              self.argcount = self.argcount - 1
!         stacksize = findDepth(self.insts)
          try:
              co = new.code(self.argcount, nlocals, stacksize,
***************
*** 194,200 ****
          l = []
          for elt in self.consts:
! 	    # XXX might be clearer to just as isinstance(CodeGen)
! 	    if hasattr(elt, 'asConst'):
! 		l.append(elt.asConst())
              else:
                  l.append(elt)
--- 194,200 ----
          l = []
          for elt in self.consts:
!             # XXX might be clearer to just as isinstance(CodeGen)
!             if hasattr(elt, 'asConst'):
!                 l.append(elt.asConst())
              else:
                  l.append(elt)
***************
*** 287,291 ****
      opnum = {}
      for num in range(len(dis.opname)):
! 	opnum[dis.opname[num]] = num
  
      # this version of emit + arbitrary hooks might work, but it's damn
--- 287,291 ----
      opnum = {}
      for num in range(len(dis.opname)):
!         opnum[dis.opname[num]] = num
  
      # this version of emit + arbitrary hooks might work, but it's damn
***************
*** 294,298 ****
      def emit(self, *args):
          self._emitDispatch(args[0], args[1:])
! 	self.insts.append(args)
  
      def _emitDispatch(self, type, args):
--- 294,298 ----
      def emit(self, *args):
          self._emitDispatch(args[0], args[1:])
!         self.insts.append(args)
  
      def _emitDispatch(self, type, args):
***************
*** 364,381 ****
  
      def __init__(self, id=None, val=None):
! 	if id is None:
! 	    id = StackRef.count
! 	    StackRef.count = StackRef.count + 1
! 	self.id = id
! 	self.val = val
  
      def __repr__(self):
! 	if self.val:
! 	    return "StackRef(val=%d)" % self.val
! 	else:
! 	    return "StackRef(id=%d)" % self.id
  
      def bind(self, inst):
! 	self.val = inst
  
      def resolve(self):
--- 364,381 ----
  
      def __init__(self, id=None, val=None):
!         if id is None:
!             id = StackRef.count
!             StackRef.count = StackRef.count + 1
!         self.id = id
!         self.val = val
  
      def __repr__(self):
!         if self.val:
!             return "StackRef(val=%d)" % self.val
!         else:
!             return "StackRef(id=%d)" % self.id
  
      def bind(self, inst):
!         self.val = inst
  
      def resolve(self):
***************
*** 383,387 ****
              print "UNRESOLVE REF", self
              return 0
! 	return self.val
  
  class StackDepthTracker:
--- 383,387 ----
              print "UNRESOLVE REF", self
              return 0
!         return self.val
  
  class StackDepthTracker:
***************
*** 389,455 ****
  
      def findDepth(self, insts):
! 	depth = 0
! 	maxDepth = 0
! 	for i in insts:
! 	    opname = i[0]
! 	    delta = self.effect.get(opname, 0)
! 	    if delta > 1:
! 		depth = depth + delta
! 	    elif delta < 0:
! 		if depth > maxDepth:
! 		    maxDepth = depth
! 		depth = depth + delta
! 	    else:
! 		if depth > maxDepth:
! 		    maxDepth = depth
! 		# now check patterns
! 		for pat, delta in self.patterns:
! 		    if opname[:len(pat)] == pat:
! 			depth = depth + delta
! 			break
! 		# if we still haven't found a match
! 		if delta == 0:
! 		    meth = getattr(self, opname)
! 		    depth = depth + meth(i[1])
! 	    if depth < 0:
! 		depth = 0
! 	return maxDepth
  
      effect = {
! 	'POP_TOP': -1,
! 	'DUP_TOP': 1,
! 	'SLICE+1': -1,
! 	'SLICE+2': -1,
! 	'SLICE+3': -2,
! 	'STORE_SLICE+0': -1,
! 	'STORE_SLICE+1': -2,
! 	'STORE_SLICE+2': -2,
! 	'STORE_SLICE+3': -3,
! 	'DELETE_SLICE+0': -1,
! 	'DELETE_SLICE+1': -2,
! 	'DELETE_SLICE+2': -2,
! 	'DELETE_SLICE+3': -3,
! 	'STORE_SUBSCR': -3,
! 	'DELETE_SUBSCR': -2,
! 	# PRINT_EXPR?
! 	'PRINT_ITEM': -1,
! 	'LOAD_LOCALS': 1,
! 	'RETURN_VALUE': -1,
! 	'EXEC_STMT': -2,
! 	'BUILD_CLASS': -2,
! 	'STORE_NAME': -1,
! 	'STORE_ATTR': -2,
! 	'DELETE_ATTR': -1,
! 	'STORE_GLOBAL': -1,
! 	'BUILD_MAP': 1,
! 	'COMPARE_OP': -1,
! 	'STORE_FAST': -1,
! 	}
      # use pattern match
      patterns = [
! 	('BINARY_', -1),
! 	('LOAD_', 1),
! 	('IMPORT_', 1),
! 	]
      # special cases
  
--- 389,455 ----
  
      def findDepth(self, insts):
!         depth = 0
!         maxDepth = 0
!         for i in insts:
!             opname = i[0]
!             delta = self.effect.get(opname, 0)
!             if delta > 1:
!                 depth = depth + delta
!             elif delta < 0:
!                 if depth > maxDepth:
!                     maxDepth = depth
!                 depth = depth + delta
!             else:
!                 if depth > maxDepth:
!                     maxDepth = depth
!                 # now check patterns
!                 for pat, delta in self.patterns:
!                     if opname[:len(pat)] == pat:
!                         depth = depth + delta
!                         break
!                 # if we still haven't found a match
!                 if delta == 0:
!                     meth = getattr(self, opname)
!                     depth = depth + meth(i[1])
!             if depth < 0:
!                 depth = 0
!         return maxDepth
  
      effect = {
!         'POP_TOP': -1,
!         'DUP_TOP': 1,
!         'SLICE+1': -1,
!         'SLICE+2': -1,
!         'SLICE+3': -2,
!         'STORE_SLICE+0': -1,
!         'STORE_SLICE+1': -2,
!         'STORE_SLICE+2': -2,
!         'STORE_SLICE+3': -3,
!         'DELETE_SLICE+0': -1,
!         'DELETE_SLICE+1': -2,
!         'DELETE_SLICE+2': -2,
!         'DELETE_SLICE+3': -3,
!         'STORE_SUBSCR': -3,
!         'DELETE_SUBSCR': -2,
!         # PRINT_EXPR?
!         'PRINT_ITEM': -1,
!         'LOAD_LOCALS': 1,
!         'RETURN_VALUE': -1,
!         'EXEC_STMT': -2,
!         'BUILD_CLASS': -2,
!         'STORE_NAME': -1,
!         'STORE_ATTR': -2,
!         'DELETE_ATTR': -1,
!         'STORE_GLOBAL': -1,
!         'BUILD_MAP': 1,
!         'COMPARE_OP': -1,
!         'STORE_FAST': -1,
!         }
      # use pattern match
      patterns = [
!         ('BINARY_', -1),
!         ('LOAD_', 1),
!         ('IMPORT_', 1),
!         ]
      # special cases
  
***************
*** 457,477 ****
      # BUILD_LIST, CALL_FUNCTION, MAKE_FUNCTION, BUILD_SLICE
      def UNPACK_TUPLE(self, count):
! 	return count
      def UNPACK_LIST(self, count):
! 	return count
      def BUILD_TUPLE(self, count):
! 	return -count
      def BUILD_LIST(self, count):
! 	return -count
      def CALL_FUNCTION(self, argc):
! 	hi, lo = divmod(argc, 256)
! 	return lo + hi * 2
      def MAKE_FUNCTION(self, argc):
! 	return -argc
      def BUILD_SLICE(self, argc):
! 	if argc == 2:
! 	    return -1
! 	elif argc == 3:
! 	    return -2
      
  findDepth = StackDepthTracker().findDepth
--- 457,477 ----
      # BUILD_LIST, CALL_FUNCTION, MAKE_FUNCTION, BUILD_SLICE
      def UNPACK_TUPLE(self, count):
!         return count
      def UNPACK_LIST(self, count):
!         return count
      def BUILD_TUPLE(self, count):
!         return -count
      def BUILD_LIST(self, count):
!         return -count
      def CALL_FUNCTION(self, argc):
!         hi, lo = divmod(argc, 256)
!         return lo + hi * 2
      def MAKE_FUNCTION(self, argc):
!         return -argc
      def BUILD_SLICE(self, argc):
!         if argc == 2:
!             return -1
!         elif argc == 3:
!             return -2
      
  findDepth = StackDepthTracker().findDepth



From guido@cnri.reston.va.us  Tue Feb 22 00:20:01 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 21 Feb 2000 19:20:01 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle ScriptBinding.py,1.7,1.8
Message-ID: <200002220020.TAA04387@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	ScriptBinding.py 
Log Message:
Added a new command: Check module (Alt-F5) It does a full syntax check
of the current module.  It also runs the tabnanny to catch any
inconsistent tabs.

Also did a little bit of refactoring: added an errorbox() method to
simplify the display of error dialogs.


Index: ScriptBinding.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/ScriptBinding.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ScriptBinding.py	1999/06/01 18:18:27	1.7
--- ScriptBinding.py	2000/02/22 00:19:58	1.8
***************
*** 1,7 ****
  """Extension to execute code outside the Python shell window.
  
! This adds two commands (to the Edit menu, until there's a separate
! Python menu):
  
  - Import module (F5) is equivalent to either import or reload of the
  current module.  The window must have been saved previously. The
--- 1,10 ----
  """Extension to execute code outside the Python shell window.
  
! This adds the following commands (to the Edit menu, until there's a
! separate Python menu):
  
+ - Check module (Alt-F5) does a full syntax check of the current module.
+ It also runs the tabnanny to catch any inconsistent tabs.
+ 
  - Import module (F5) is equivalent to either import or reload of the
  current module.  The window must have been saved previously. The
***************
*** 19,26 ****
--- 22,41 ----
  import tkMessageBox
  
+ indent_message = """Error: Inconsistent indentation detected!
+ 
+ This means that either:
+ 
+ (1) your indentation is outright incorrect (easy to fix), or
+ 
+ (2) your indentation mixes tabs and spaces in a way that depends on \
+ how many spaces a tab is worth.
  
+ To fix case 2, change all tabs to spaces by using Select All followed \
+ by Untabify Region (both in the Edit menu)."""
+ 
  class ScriptBinding:
      
      keydefs = {
+         '<<check-module>>': ['<Alt-F5>', '<Meta-F5>'],
          '<<import-module>>': ['<F5>'],
          '<<run-script>>': ['<Control-F5>'],
***************
*** 29,32 ****
--- 44,48 ----
      menudefs = [
          ('edit', [None,
+                   ('Check module', '<<check-module>>'),
                    ('Import module', '<<import-module>>'),
                    ('Run script', '<<run-script>>'),
***************
*** 42,45 ****
--- 58,114 ----
          self.root = self.flist.root
  
+     def check_module_event(self, event):
+         filename = self.getfilename()
+         if not filename:
+             return
+         if not self.tabnanny(filename):
+             return
+         if not self.checksyntax(filename):
+             return
+ 
+     def tabnanny(self, filename):
+         import tabnanny
+         import tokenize
+         tabnanny.reset_globals()
+         f = open(filename, 'r')
+         try:
+             tokenize.tokenize(f.readline, tabnanny.tokeneater)
+         except tokenize.TokenError, msg:
+             self.errorbox("Token error",
+                           "Token error:\n%s" % str(msg))
+             return 0
+         except tabnanny.NannyNag, nag:
+             # The error messages from tabnanny are too confusing...
+             self.editwin.gotoline(nag.get_lineno())
+             self.errorbox("Tab/space error", indent_message)
+             return 0
+         return 1
+ 
+     def checksyntax(self, filename):
+         f = open(filename, 'r')
+         source = f.read()
+         f.close()
+         if '\r' in source:
+             import re
+             source = re.sub(r"\r\n", "\n", source)
+         if source and source[-1] != '\n':
+             source = source + '\n'
+         try:
+             compile(source, filename, "exec")
+         except (SyntaxError, OverflowError), err:
+             try:
+                 msg, (errorfilename, lineno, offset, line) = err
+                 if not errorfilename:
+                     err.args = msg, (filename, lineno, offset, line)
+                     err.filename = filename
+             except:
+                 lineno = None
+                 msg = "*** " + str(err)
+             if lineno:
+                 self.editwin.gotoline(lineno)
+             self.errorbox("Syntax error",
+                           "There's an error in your program:\n" + msg)
+         return 1
+ 
      def import_module_event(self, event):
          filename = self.getfilename()
***************
*** 76,79 ****
--- 145,149 ----
          if (not sys.argv or
              os.path.basename(sys.argv[0]) != os.path.basename(filename)):
+             # XXX Too often this discards arguments the user just set...
              sys.argv = [filename]
          interp.execfile(filename)
***************
*** 81,96 ****
      def getfilename(self):
          # Logic to make sure we have a saved filename
          if not self.editwin.get_saved():
!             tkMessageBox.showerror("Not saved",
!                                    "Please save first!",
!                                    master=self.editwin.text)
              self.editwin.text.focus_set()
              return
          filename = self.editwin.io.filename
          if not filename:
!             tkMessageBox.showerror("No file name",
!                                    "This window has no file name",
!                                    master=self.editwin.text)
!             self.editwin.text.focus_set()
              return
          return filename
--- 151,169 ----
      def getfilename(self):
          # Logic to make sure we have a saved filename
+         # XXX Better logic would offer to save!
          if not self.editwin.get_saved():
!             self.errorbox("Not saved",
!                           "Please save first!")
              self.editwin.text.focus_set()
              return
          filename = self.editwin.io.filename
          if not filename:
!             self.errorbox("No file name",
!                           "This window has no file name")
              return
          return filename
+ 
+     def errorbox(self, title, message):
+         # XXX This should really be a function of EditorWindow...
+         tkMessageBox.showerror(title, message, master=self.editwin.text)
+         self.editwin.text.focus_set()



From guido@cnri.reston.va.us  Tue Feb 22 00:20:39 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 21 Feb 2000 19:20:39 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle tabnanny.py,NONE,1.1
Message-ID: <200002220020.TAA04408@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Added Files:
	tabnanny.py 
Log Message:
Another copy of a file that already exists elsewhere: tabnanny.py.

It's clear that this really needs to move to the Lib directory!






From fdrake@acm.org  Tue Feb 22 04:25:20 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Mon, 21 Feb 2000 23:25:20 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle tabnanny.py,NONE,1.1
In-Reply-To: <200002220020.TAA04408@eric.cnri.reston.va.us>
References: <200002220020.TAA04408@eric.cnri.reston.va.us>
Message-ID: <14514.4016.592050.87060@weyr.cnri.reston.va.us>

Guido van Rossum writes:
 > It's clear that this really needs to move to the Lib directory!

  So document it!


  -Fred


From fdrake@weyr.cnri.reston.va.us  Tue Feb 22 04:34:32 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 23:34:32 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tut tut.tex,1.100.2.4,1.100.2.5
Message-ID: <200002220434.XAA09464@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tut
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tut

Modified Files:
      Tag: release152p1-patches
	tut.tex 
Log Message:

When introducing if statements, don't use:

#  [Code which sets 'x' to a value...]

to indicate that x should be set; set it!  This confusion was
indicated in a question to python-docs from
<constantina.s@virginnet.co.uk>.


Index: tut.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tut/tut.tex,v
retrieving revision 1.100.2.4
retrieving revision 1.100.2.5
diff -C2 -r1.100.2.4 -r1.100.2.5
*** tut.tex	2000/02/21 17:21:18	1.100.2.4
--- tut.tex	2000/02/22 04:34:28	1.100.2.5
***************
*** 913,917 ****
  
  \begin{verbatim}
! >>> #  [Code which sets 'x' to a value...]
  >>> if x < 0:
  ...      x = 0
--- 913,918 ----
  
  \begin{verbatim}
! >>> import random
! >>> x = random.choice([-1, 0, 1, 2])
  >>> if x < 0:
  ...      x = 0



From fdrake@weyr.cnri.reston.va.us  Tue Feb 22 17:26:05 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 22 Feb 2000 12:26:05 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tut tut.tex,1.100.2.5,1.100.2.6
Message-ID: <200002221726.MAA10402@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tut
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tut

Modified Files:
      Tag: release152p1-patches
	tut.tex 
Log Message:

Adjust the examples starting the "if Statement" and "Handling
Exceptions" based on comments from Peter Funk <pf@artcom-gmbh.de>;
these should be more "approachable" for novice programmers.


Index: tut.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tut/tut.tex,v
retrieving revision 1.100.2.5
retrieving revision 1.100.2.6
diff -C2 -r1.100.2.5 -r1.100.2.6
*** tut.tex	2000/02/22 04:34:28	1.100.2.5
--- tut.tex	2000/02/22 17:26:02	1.100.2.6
***************
*** 913,918 ****
  
  \begin{verbatim}
! >>> import random
! >>> x = random.choice([-1, 0, 1, 2])
  >>> if x < 0:
  ...      x = 0
--- 913,917 ----
  
  \begin{verbatim}
! >>> x = int(raw_input("Please enter a number: "))
  >>> if x < 0:
  ...      x = 0
***************
*** 2747,2766 ****
  
  It is possible to write programs that handle selected exceptions.
! Look at the following example, which prints a table of inverses of
! some floating point numbers:
  
  \begin{verbatim}
! >>> numbers = [0.3333, 2.5, 0, 10]
! >>> for x in numbers:
! ...     print x,
  ...     try:
! ...         print 1.0 / x
! ...     except ZeroDivisionError:
! ...         print '*** has no inverse ***'
  ...     
- 0.3333 3.00030003
- 2.5 0.4
- 0 *** has no inverse ***
- 10 0.1
  \end{verbatim}
  
--- 2746,2763 ----
  
  It is possible to write programs that handle selected exceptions.
! Look at the following example, which asks the user for input until a
! valid integer has been entered, but allows the user to interrupt the
! program (using \kbd{Control-C} or whatever the operating system
! supports); note that a user-generated interruption is signalled by
! raising the \exception{KeyboardInterrupt} exception.
  
  \begin{verbatim}
! >>> while 1:
  ...     try:
! ...         x = int(raw_input("Please enter a number: "))
! ...         break
! ...     except ValueError:
! ...         print "Oops! That was no valid number.  Try again..."
  ...     
  \end{verbatim}
  



From fdrake@weyr.cnri.reston.va.us  Tue Feb 22 18:20:07 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 22 Feb 2000 13:20:07 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/texinputs boilerplate.tex,1.38,1.39
Message-ID: <200002221820.NAA11073@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/texinputs
In directory weyr:/home/fdrake/projects/python/Doc/texinputs

Modified Files:
	boilerplate.tex 
Log Message:

This branch is for 1.6 & forward.


Index: boilerplate.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/texinputs/boilerplate.tex,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** boilerplate.tex	1999/11/18 20:57:36	1.38
--- boilerplate.tex	2000/02/22 18:20:03	1.39
***************
*** 4,10 ****
  	Corporation for National Research Initiatives (CNRI) \\
  	1895 Preston White Drive, Reston, Va 20191, USA \\
! 	E-mail: \email{guido@CNRI.Reston.Va.US}, \email{guido@python.org}
  }
  
  \date{\today}			% XXX update before release!
! \release{1.5.2$+$}
--- 4,10 ----
  	Corporation for National Research Initiatives (CNRI) \\
  	1895 Preston White Drive, Reston, Va 20191, USA \\
! 	E-mail: \email{guido@python.org}
  }
  
  \date{\today}			% XXX update before release!
! \release{1.6}



From guido@python.org  Tue Feb 22 18:53:29 2000
From: guido@python.org (Guido van Rossum)
Date: Tue, 22 Feb 2000 13:53:29 -0500
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle tabnanny.py,NONE,1.1
In-Reply-To: Your message of "Mon, 21 Feb 2000 23:25:20 EST."
 <14514.4016.592050.87060@weyr.cnri.reston.va.us>
References: <200002220020.TAA04408@eric.cnri.reston.va.us>
 <14514.4016.592050.87060@weyr.cnri.reston.va.us>
Message-ID: <200002221853.NAA05456@eric.cnri.reston.va.us>

>   So document it!

Easier said than done.  It was written as a script only.  What really
needs to happen first is to restructure it so that it's easier to use
as a module.  Also, the error messages it generates suck.

--Guido van Rossum (home page: http://www.python.org/~guido/)


From guido@cnri.reston.va.us  Wed Feb 23 15:32:22 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 23 Feb 2000 10:32:22 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib tabnanny.py,1.9,1.10
Message-ID: <200002231532.KAA07188@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	tabnanny.py 
Log Message:
Added tabnanny.py, by Tim Peters, formerly from Tools/scripts, to the
standard library.  Added some comments:

# XXX Note: this is now a standard library module.
# XXX The API needs to undergo changes however; the current code is too
# XXX script-like.  This will be addressed later.


Index: tabnanny.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/tabnanny.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** tabnanny.py	1999/07/30 17:48:20	1.9
--- tabnanny.py	2000/02/23 15:32:19	1.10
***************
*** 5,8 ****
--- 5,12 ----
  # Released to the public domain, by Tim Peters, 15 April 1998.
  
+ # XXX Note: this is now a standard library module.
+ # XXX The API needs to undergo changes however; the current code is too
+ # XXX script-like.  This will be addressed later.
+ 
  __version__ = "6"
  



From guido@cnri.reston.va.us  Wed Feb 23 15:33:55 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 23 Feb 2000 10:33:55 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts tabnanny.py,1.9,NONE
Message-ID: <200002231533.KAA07236@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Removed Files:
	tabnanny.py 
Log Message:
Moved tabnanny.py to standard library status.




From guido@cnri.reston.va.us  Wed Feb 23 15:34:46 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 23 Feb 2000 10:34:46 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts tabpolice.py,1.4,NONE
Message-ID: <200002231534.KAA07256@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Removed Files:
	tabpolice.py 
Log Message:
Deleting tabpolice.py; it was superceded by tabnanny.py long ago.




From fdrake@weyr.cnri.reston.va.us  Wed Feb 23 15:44:11 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 23 Feb 2000 10:44:11 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libtabnanny.tex,NONE,1.1
Message-ID: <200002231544.KAA16548@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc/lib

Added Files:
	libtabnanny.tex 
Log Message:

Initial version from Peter Funk <pf@artcom-gmbh.de>, with minor
consistency changes and a note that the API may change in the future.





From fdrake@weyr.cnri.reston.va.us  Wed Feb 23 15:44:36 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 23 Feb 2000 10:44:36 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc Makefile.deps,1.26,1.27
Message-ID: <200002231544.KAA16574@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc

Modified Files:
	Makefile.deps 
Log Message:

Added dependency on libtabnanny.tex.


Index: Makefile.deps
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/Makefile.deps,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** Makefile.deps	1999/10/29 20:49:22	1.26
--- Makefile.deps	2000/02/23 15:44:34	1.27
***************
*** 197,200 ****
--- 197,201 ----
  	../lib/libpyclbr.tex \
  	../lib/libtokenize.tex \
+ 	../lib/libtabnanny.tex \
  	../lib/libmhlib.tex \
  	../lib/libtelnetlib.tex \



From fdrake@weyr.cnri.reston.va.us  Wed Feb 23 15:45:01 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 23 Feb 2000 10:45:01 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib lib.tex,1.147,1.148
Message-ID: <200002231545.KAA16599@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc/lib

Modified Files:
	lib.tex 
Log Message:

Added entry for libtabnanny.tex.


Index: lib.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/lib.tex,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -r1.147 -r1.148
*** lib.tex	1999/11/10 16:21:36	1.147
--- lib.tex	2000/02/23 15:44:58	1.148
***************
*** 91,94 ****
--- 91,95 ----
  \input{libkeyword}
  \input{libtokenize}
+ \input{libtabnanny}
  \input{libpyclbr}
  \input{libcode}



From fdrake@weyr.cnri.reston.va.us  Wed Feb 23 15:47:19 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 23 Feb 2000 10:47:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects dictobject.c,2.48,2.49
Message-ID: <200002231547.KAA16647@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory weyr:/home/fdrake/projects/python/Objects

Modified Files:
	dictobject.c 
Log Message:

dict_has_key():  Accept only one parameter.  PR#210 reported by
                 Andreas Jung <ajung@sz-sb.de>.


Index: dictobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/dictobject.c,v
retrieving revision 2.48
retrieving revision 2.49
diff -C2 -r2.48 -r2.49
*** dictobject.c	1999/03/24 19:06:42	2.48
--- dictobject.c	2000/02/23 15:47:16	2.49
***************
*** 960,964 ****
  	long hash;
  	register long ok;
! 	if (!PyArg_Parse(args, "O", &key))
  		return NULL;
  #ifdef CACHE_HASH
--- 960,964 ----
  	long hash;
  	register long ok;
! 	if (!PyArg_ParseTuple(args, "O:has_key", &key))
  		return NULL;
  #ifdef CACHE_HASH
***************
*** 985,989 ****
  	long hash;
  
! 	if (!PyArg_ParseTuple(args, "O|O", &key, &failobj))
  		return NULL;
  	if (mp->ma_table == NULL)
--- 985,989 ----
  	long hash;
  
! 	if (!PyArg_ParseTuple(args, "O|O:get", &key, &failobj))
  		return NULL;
  	if (mp->ma_table == NULL)
***************
*** 1022,1026 ****
  
  static PyMethodDef mapp_methods[] = {
! 	{"has_key",	(PyCFunction)dict_has_key},
  	{"keys",	(PyCFunction)dict_keys},
  	{"items",	(PyCFunction)dict_items},
--- 1022,1026 ----
  
  static PyMethodDef mapp_methods[] = {
! 	{"has_key",	(PyCFunction)dict_has_key,      METH_VARARGS},
  	{"keys",	(PyCFunction)dict_keys},
  	{"items",	(PyCFunction)dict_items},
***************
*** 1029,1033 ****
  	{"clear",	(PyCFunction)dict_clear},
  	{"copy",	(PyCFunction)dict_copy},
! 	{"get",         (PyCFunction)dict_get, 1},
  	{NULL,		NULL}		/* sentinel */
  };
--- 1029,1033 ----
  	{"clear",	(PyCFunction)dict_clear},
  	{"copy",	(PyCFunction)dict_copy},
! 	{"get",         (PyCFunction)dict_get,          METH_VARARGS},
  	{NULL,		NULL}		/* sentinel */
  };



From akuchlin@CNRI.Reston.VA.US  Wed Feb 23 22:18:52 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Wed, 23 Feb 2000 17:18:52 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python ceval.c,2.167,2.168
Message-ID: <200002232218.RAA01112@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory amarok:/home/akuchlin/src/Python-1.5/Python

Modified Files:
	ceval.c 
Log Message:
Allow using long integers as slice indexes


Index: ceval.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/ceval.c,v
retrieving revision 2.167
retrieving revision 2.168
diff -C2 -r2.167 -r2.168
*** ceval.c	2000/02/21 17:59:48	2.167
--- ceval.c	2000/02/23 22:18:48	2.168
***************
*** 2536,2545 ****
  	if (v != NULL) {
  		long x;
! 		if (!PyInt_Check(v)) {
  			PyErr_SetString(PyExc_TypeError,
  					"slice index must be int");
  			return -1;
  		}
- 		x = PyInt_AsLong(v);
  		/* Truncate -- very long indices are truncated anyway */
  		if (x > INT_MAX)
--- 2536,2577 ----
  	if (v != NULL) {
  		long x;
! 		if (PyInt_Check(v)) {
! 			x = PyInt_AsLong(v);
! 		} else if (PyLong_Check(v)) {
! 			x = PyLong_AsLong(v);
! 			if (x==-1 && PyErr_Occurred()) {
! 				PyObject *long_zero;
! 
! 				if (!PyErr_ExceptionMatches( PyExc_OverflowError ) ) {
! 					/* It's not an overflow error, so just 
! 					   signal an error */
! 					return -1;
! 				}
! 
! 				/* It's an overflow error, so we need to 
! 				   check the sign of the long integer, 
! 				   set the value to INT_MAX or 0, and clear 
! 				   the error. */
! 
! 				/* Create a long integer with a value of 0 */
! 				long_zero = PyLong_FromLong( 0L );
! 				if (long_zero == NULL) return -1;
! 
! 				/* Check sign */
! 				if (PyObject_Compare(long_zero, v) < 0)
! 					x = INT_MAX;
! 				else
! 					x = 0;
! 				
! 				/* Free the long integer we created, and clear the
! 				   OverflowError */
! 				Py_DECREF(long_zero);
! 				PyErr_Clear();
! 			}
! 		} else {
  			PyErr_SetString(PyExc_TypeError,
  					"slice index must be int");
  			return -1;
  		}
  		/* Truncate -- very long indices are truncated anyway */
  		if (x > INT_MAX)



From akuchlin@CNRI.Reston.VA.US  Wed Feb 23 22:21:53 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Wed, 23 Feb 2000 17:21:53 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects abstract.c,2.29,2.30
Message-ID: <200002232221.RAA01146@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory amarok:/home/akuchlin/src/Python-1.5/Objects

Modified Files:
	abstract.c 
Log Message:
Allow using long integers as arguments to PyObject_GetItem(), _SetItem(), 
    and _DelItem().  
In sequence multiplication by a long, only call PyErr_Occurred() when the 
    value returned is -1.


Index: abstract.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/abstract.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** abstract.c	2000/02/14 22:22:04	2.29
--- abstract.c	2000/02/23 22:21:50	2.30
***************
*** 123,126 ****
--- 123,132 ----
  		if (PyInt_Check(key))
  			return PySequence_GetItem(o, PyInt_AsLong(key));
+ 		else if (PyLong_Check(key)) {
+ 			long key_value = PyLong_AsLong(key);
+ 			if (key_value == -1 && PyErr_Occurred())
+ 				return NULL;
+ 			return PySequence_GetItem(o, key_value);
+ 		}
  		return type_error("sequence index must be integer");
  	}
***************
*** 148,151 ****
--- 154,163 ----
  		if (PyInt_Check(key))
  			return PySequence_SetItem(o, PyInt_AsLong(key), value);
+ 		else if (PyLong_Check(key)) {
+ 			long key_value = PyLong_AsLong(key);
+ 			if (key_value == -1 && PyErr_Occurred())
+ 				return -1;
+ 			return PySequence_SetItem(o, key_value, value);
+ 		}
  		type_error("sequence index must be integer");
  		return -1;
***************
*** 174,177 ****
--- 186,195 ----
  		if (PyInt_Check(key))
  			return PySequence_DelItem(o, PyInt_AsLong(key));
+ 		else if (PyLong_Check(key)) {
+ 			long key_value = PyLong_AsLong(key);
+ 			if (key_value == -1 && PyErr_Occurred())
+ 				return -1;
+ 			return PySequence_DelItem(o, key_value);
+ 		}
  		type_error("sequence index must be integer");
  		return -1;
***************
*** 392,396 ****
  		else if (PyLong_Check(w)) {
  			mul_value = PyLong_AsLong(w);
! 			if (PyErr_Occurred())
                                  return NULL; 
  		}
--- 410,414 ----
  		else if (PyLong_Check(w)) {
  			mul_value = PyLong_AsLong(w);
! 			if (mul_value == -1 && PyErr_Occurred())
                                  return NULL; 
  		}



From akuchlin@CNRI.Reston.VA.US  Wed Feb 23 22:23:20 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Wed, 23 Feb 2000 17:23:20 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_types.py,1.12,1.13
Message-ID: <200002232223.RAA01170@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/test
In directory amarok:/home/akuchlin/src/Python-1.5/Lib/test

Modified Files:
	test_types.py 
Log Message:
Add tests to exercise sequence operations (multiplication, indexing,
    slicing) using long integers


Index: test_types.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/test/test_types.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** test_types.py	1998/07/16 15:29:06	1.12
--- test_types.py	2000/02/23 22:23:17	1.13
***************
*** 131,135 ****
--- 131,137 ----
  if [1,2]+[3,4] <> [1,2,3,4]: raise TestFailed, 'list concatenation'
  if [1,2]*3 <> [1,2,1,2,1,2]: raise TestFailed, 'list repetition *3'
+ if [1,2]*3L <> [1,2,1,2,1,2]: raise TestFailed, 'list repetition *3L'
  if 0*[1,2,3] <> []: raise TestFailed, 'list repetition 0*'
+ if 0L*[1,2,3] <> []: raise TestFailed, 'list repetition 0L*'
  if min([1,2]) <> 1 or max([1,2]) <> 2: raise TestFailed, 'min/max list'
  if 0 in [0,1,2] and 1 in [0,1,2] and 2 in [0,1,2] and 3 not in [0,1,2]: pass
***************
*** 151,158 ****
--- 153,167 ----
  print '6.5.3a Additional list operations'
  a = [0,1,2,3,4]
+ a[0L] = 1
+ a[1L] = 2
+ a[2L] = 3
+ if a <> [1,2,3,3,4]: raise TestFailed, 'list item assignment [0L], [1L], [2L]'
  a[0] = 5
  a[1] = 6
  a[2] = 7
  if a <> [5,6,7,3,4]: raise TestFailed, 'list item assignment [0], [1], [2]'
+ a[-2L] = 88
+ a[-1L] = 99
+ if a <> [5,6,7,88,99]: raise TestFailed, 'list item assignment [-2L], [-1L]'
  a[-2] = 8
  a[-1] = 9
***************
*** 162,165 ****
--- 171,176 ----
  a[1:1] = [1,2,3]
  if a <> [0,1,2,3,4]: raise TestFailed, 'list slice assignment'
+ a[ 1L : 4L] = [7,8,9]
+ if a <> [0,7,8,9,4]: raise TestFailed, 'list slice assignment using long ints'
  del a[1:4]
  if a <> [0,4]: raise TestFailed, 'list slice deletion'
***************
*** 168,171 ****
--- 179,189 ----
  del a[-1]
  if a <> []: raise TestFailed, 'list item deletion [-1]'
+ a=range(0,5)
+ del a[1L:4L]
+ if a <> [0,4]: raise TestFailed, 'list slice deletion'
+ del a[0L]
+ if a <> [4]: raise TestFailed, 'list item deletion [0]'
+ del a[-1L]
+ if a <> []: raise TestFailed, 'list item deletion [-1]'
  a.append(0)
  a.append(1)
***************
*** 192,195 ****
--- 210,220 ----
  z = range(12)
  z.sort(myComparison)
+ 
+ # Test extreme cases with long ints
+ a = [0,1,2,3,4]
+ if a[ -pow(2,128L): 3 ] != [0,1,2]: 
+ 	raise TestFailed, "list slicing with too-small long integer"
+ if a[ 3: pow(2,145L) ] != [3,4]: 
+ 	raise TestFailed, "list slicing with too-large long integer"
  
  print '6.6 Mappings == Dictionaries'



From guido@cnri.reston.va.us  Thu Feb 24 02:24:53 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 23 Feb 2000 21:24:53 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib imaplib.py,1.15,1.16
Message-ID: <200002240224.VAA08591@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	imaplib.py 
Log Message:
Piers Lauder:

	A change in my last patch could, under certain circumstances,
	cause a loop if the connection to the server dropped while
	waiting for a command completion. I've changed the code to
	re-raise the error after possible debugging output.


Index: imaplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imaplib.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** imaplib.py	2000/02/17 17:12:39	1.15
--- imaplib.py	2000/02/24 02:24:50	1.16
***************
*** 16,20 ****
  """
  
! __version__ = "2.30"
  
  import binascii, re, socket, string, time, random, sys
--- 16,20 ----
  """
  
! __version__ = "2.32"
  
  import binascii, re, socket, string, time, random, sys
***************
*** 756,762 ****
  
  			# Some have reported "unexpected response" exceptions.
! 			# (Isn't this non-IMAP4-compliant behaviour?
! 			# Please mail me details printed below!)
! 			# Anyway, ignore them here.
  
  			try:
--- 756,762 ----
  
  			# Some have reported "unexpected response" exceptions.
! 			# Note that ignoring them here causes loops.
! 			# Instead, send me details of the unexpected response and
! 			# I'll update the code in `_get_response()'.
  
  			try:
***************
*** 765,770 ****
  				if __debug__:
  					if self.debug >= 1:
- 						_mesg('abort exception ignored: %s' % val)
  						print_log()
  
  
--- 765,770 ----
  				if __debug__:
  					if self.debug >= 1:
  						print_log()
+ 				raise
  
  



From guido@cnri.reston.va.us  Thu Feb 24 02:26:54 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 23 Feb 2000 21:26:54 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib posixpath.py,1.27,1.28
Message-ID: <200002240226.VAA08616@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	posixpath.py 
Log Message:
Mark Favas discovered this: getatime() accidentally returned the MTIME!
This fixes PR#211.


Index: posixpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/posixpath.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** posixpath.py	2000/02/04 15:10:34	1.27
--- posixpath.py	2000/02/24 02:26:51	1.28
***************
*** 144,148 ****
      """Return the last access time of a file, reported by os.stat()."""
      st = os.stat(filename)
!     return st[stat.ST_MTIME]
  
  
--- 144,148 ----
      """Return the last access time of a file, reported by os.stat()."""
      st = os.stat(filename)
!     return st[stat.ST_ATIME]
  
  



From guido@cnri.reston.va.us  Thu Feb 24 15:01:46 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 24 Feb 2000 10:01:46 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/lib-tk tkSimpleDialog.py,1.4,1.5
Message-ID: <200002241501.KAA09279@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/lib-tk
In directory eric:/projects/python/develop/guido/src/Lib/lib-tk

Modified Files:
	tkSimpleDialog.py 
Log Message:
Moshe Zadka:
Added docstrings to tkSimpleDialog.py


Index: tkSimpleDialog.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/lib-tk/tkSimpleDialog.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** tkSimpleDialog.py	1999/06/25 15:53:54	1.4
--- tkSimpleDialog.py	2000/02/24 15:01:43	1.5
***************
*** 12,15 ****
--- 12,29 ----
  # dialog base class
  
+ '''Dialog boxes
+ 
+ This module handles dialog boxes. It contains the following
+ public symbols:
+ 
+ Dialog -- a base class for dialogs
+ 
+ askinteger -- get an integer from the user
+ 
+ askfloat -- get a float from the user
+ 
+ askstring -- get a string from the user
+ '''
+ 
  from Tkinter import *
  import os
***************
*** 17,22 ****
--- 31,49 ----
  class Dialog(Toplevel):
  
+     '''Class to open dialogs.
+ 
+     This class is intended as a base class for custom dialogs
+     '''
+ 
      def __init__(self, parent, title = None):
  
+         '''Initialize a dialog.
+ 
+         Arguments:
+ 
+             parent -- a parent window (the application window)
+ 
+             title -- the dialog title
+         '''
          Toplevel.__init__(self, parent)
          self.transient(parent)
***************
*** 50,53 ****
--- 77,81 ----
  
      def destroy(self):
+         '''Destroy the window'''
          self.initial_focus = None
          Toplevel.destroy(self)
***************
*** 57,68 ****
  
      def body(self, master):
!         # create dialog body.  return widget that should have
!         # initial focus.  this method should be overridden
  
          pass
  
      def buttonbox(self):
!         # add standard button box. override if you don't want the
!         # standard buttons
          
          box = Frame(self)
--- 85,101 ----
  
      def body(self, master):
!         '''create dialog body.
  
+         return widget that should have initial focus. 
+         This method should be overridden, and is called
+         by the __init__ method.
+         '''
          pass
  
      def buttonbox(self):
!         '''add standard button box. 
! 
!         override if you don't want the standard buttons
!         '''
          
          box = Frame(self)
***************
*** 104,111 ****
--- 137,154 ----
  
      def validate(self):
+         '''validate the data
  
+         This method is called automatically to validate the data before the 
+         dialog is destroyed. By default, it always validates OK.
+         '''
+ 
          return 1 # override
  
      def apply(self):
+         '''process the data
+ 
+         This method is called automatically to process the data, *after*
+         the dialog is destroyed. By default, it does nothing.
+         '''
  
          pass # override
***************
*** 197,200 ****
--- 240,253 ----
  
  def askinteger(title, prompt, **kw):
+     '''get an integer from the user
+ 
+     Arguments:
+ 
+         title -- the dialog title
+         prompt -- the label text
+         **kw -- see SimpleDialog class
+ 
+     Return value is an integer
+     '''
      d = apply(_QueryInteger, (title, prompt), kw)
      return d.result
***************
*** 206,209 ****
--- 259,272 ----
  
  def askfloat(title, prompt, **kw):
+     '''get a float from the user
+ 
+     Arguments:
+ 
+         title -- the dialog title
+         prompt -- the label text
+         **kw -- see SimpleDialog class
+ 
+     Return value is a float
+     '''
      d = apply(_QueryFloat, (title, prompt), kw)
      return d.result
***************
*** 214,217 ****
--- 277,290 ----
  
  def askstring(title, prompt, **kw):
+     '''get a string from the user
+ 
+     Arguments:
+ 
+         title -- the dialog title
+         prompt -- the label text
+         **kw -- see SimpleDialog class
+ 
+     Return value is a string
+     '''
      d = apply(_QueryString, (title, prompt), kw)
      return d.result



From guido@cnri.reston.va.us  Thu Feb 24 15:23:05 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 24 Feb 2000 10:23:05 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects listobject.c,2.63,2.64
Message-ID: <200002241523.KAA09548@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	listobject.c 
Log Message:
Made all list methods use PyArg_ParseTuple(), for more accurate
diagnostics.

*** INCOMPATIBLE CHANGE: This changes append(), remove(), index(), and
*** count() to require exactly one argument -- previously, multiple
*** arguments were silently assumed to be a tuple.


Index: listobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/listobject.c,v
retrieving revision 2.63
retrieving revision 2.64
diff -C2 -r2.63 -r2.64
*** listobject.c	2000/01/20 22:32:54	2.63
--- listobject.c	2000/02/24 15:23:03	2.64
***************
*** 558,562 ****
  	int i;
  	PyObject *v;
! 	if (!PyArg_Parse(args, "(iO)", &i, &v))
  		return NULL;
  	return ins(self, i, v);
--- 558,562 ----
  	int i;
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "iO", &i, &v))
  		return NULL;
  	return ins(self, i, v);
***************
*** 569,573 ****
  {
  	PyObject *v;
! 	if (!PyArg_Parse(args, "O", &v))
  		return NULL;
  	return ins(self, (int) self->ob_size, v);
--- 569,573 ----
  {
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	return ins(self, (int) self->ob_size, v);
***************
*** 1217,1226 ****
  
  static PyObject *
! listsort(self, compare)
  	PyListObject *self;
! 	PyObject *compare;
  {
  	int err;
  
  	self->ob_type = &immutable_list_type;
  	err = samplesortslice(self->ob_item,
--- 1217,1231 ----
  
  static PyObject *
! listsort(self, args)
  	PyListObject *self;
! 	PyObject *args;
  {
  	int err;
+ 	PyObject *compare = NULL;
  
+ 	if (args != NULL) {
+ 		if (!PyArg_ParseTuple(args, "|O", &compare))
+ 			return NULL;
+ 	}
  	self->ob_type = &immutable_list_type;
  	err = samplesortslice(self->ob_item,
***************
*** 1257,1264 ****
  	register PyObject *tmp;
  	
! 	if (args != NULL) {
! 		PyErr_BadArgument();
  		return NULL;
- 	}
  
  	if (self->ob_size > 1) {
--- 1262,1267 ----
  	register PyObject *tmp;
  	
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
  	if (self->ob_size > 1) {
***************
*** 1322,1332 ****
  {
  	int i;
! 	
! 	if (args == NULL) {
! 		PyErr_BadArgument();
  		return NULL;
- 	}
  	for (i = 0; i < self->ob_size; i++) {
! 		if (PyObject_Compare(self->ob_item[i], args) == 0)
  			return PyInt_FromLong((long)i);
  		if (PyErr_Occurred())
--- 1325,1334 ----
  {
  	int i;
! 	PyObject *v;
! 
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
! 		if (PyObject_Compare(self->ob_item[i], v) == 0)
  			return PyInt_FromLong((long)i);
  		if (PyErr_Occurred())
***************
*** 1344,1355 ****
  	int count = 0;
  	int i;
! 	
! 	if (args == NULL) {
! 		PyErr_SetString(PyExc_TypeError,
! 				"list.count(x): argument missing");
  		return NULL;
- 	}
  	for (i = 0; i < self->ob_size; i++) {
! 		if (PyObject_Compare(self->ob_item[i], args) == 0)
  			count++;
  		if (PyErr_Occurred())
--- 1346,1355 ----
  	int count = 0;
  	int i;
! 	PyObject *v;
! 
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
! 		if (PyObject_Compare(self->ob_item[i], v) == 0)
  			count++;
  		if (PyErr_Occurred())
***************
*** 1365,1375 ****
  {
  	int i;
! 	
! 	if (args == NULL) {
! 		PyErr_BadArgument();
  		return NULL;
- 	}
  	for (i = 0; i < self->ob_size; i++) {
! 		if (PyObject_Compare(self->ob_item[i], args) == 0) {
  			if (list_ass_slice(self, i, i+1,
  					   (PyObject *)NULL) != 0)
--- 1365,1374 ----
  {
  	int i;
! 	PyObject *v;
! 
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
! 		if (PyObject_Compare(self->ob_item[i], v) == 0) {
  			if (list_ass_slice(self, i, i+1,
  					   (PyObject *)NULL) != 0)
***************
*** 1405,1417 ****
  
  static PyMethodDef list_methods[] = {
! 	{"append",	(PyCFunction)listappend, 0, append_doc},
! 	{"insert",	(PyCFunction)listinsert, 0, insert_doc},
  	{"extend",      (PyCFunction)listextend, 1, extend_doc},
  	{"pop",		(PyCFunction)listpop, 1, pop_doc},
! 	{"remove",	(PyCFunction)listremove, 0, remove_doc},
! 	{"index",	(PyCFunction)listindex, 0, index_doc},
! 	{"count",	(PyCFunction)listcount, 0, count_doc},
! 	{"reverse",	(PyCFunction)listreverse, 0, reverse_doc},
! 	{"sort",	(PyCFunction)listsort, 0, sort_doc},
  	{NULL,		NULL}		/* sentinel */
  };
--- 1404,1416 ----
  
  static PyMethodDef list_methods[] = {
! 	{"append",	(PyCFunction)listappend, 1, append_doc},
! 	{"insert",	(PyCFunction)listinsert, 1, insert_doc},
  	{"extend",      (PyCFunction)listextend, 1, extend_doc},
  	{"pop",		(PyCFunction)listpop, 1, pop_doc},
! 	{"remove",	(PyCFunction)listremove, 1, remove_doc},
! 	{"index",	(PyCFunction)listindex, 1, index_doc},
! 	{"count",	(PyCFunction)listcount, 1, count_doc},
! 	{"reverse",	(PyCFunction)listreverse, 1, reverse_doc},
! 	{"sort",	(PyCFunction)listsort, 1, sort_doc},
  	{NULL,		NULL}		/* sentinel */
  };



From guido@cnri.reston.va.us  Thu Feb 24 15:26:33 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 24 Feb 2000 10:26:33 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules mpzmodule.c,2.20,2.21
Message-ID: <200002241526.KAA09666@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/src/Modules

Modified Files:
	mpzmodule.c 
Log Message:
Peter Funk:

This patch allows building the Python 'mpzmodule' under SuSE Linux
without having to install the source package of the GMP-libary.
The gmp-mparam.h seems to be an internal header file.  The patch 
shouldn't hurt any other platforms.


Index: mpzmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/mpzmodule.c,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** mpzmodule.c	1998/12/14 19:36:14	2.20
--- mpzmodule.c	2000/02/24 15:26:30	2.21
***************
*** 93,97 ****
--- 93,102 ----
  
  #include "gmp.h"
+ 
+ #if defined __GLIBC__ && __GLIBC__ >= 2 /*aid building on Linux distributions*/
+ #define BITS_PER_MP_LIMB mp_bits_per_limb
+ #else
  #include "gmp-mparam.h"
+ #endif
  
  #if __GNU_MP__ + 0 == 2



From guido@python.org  Thu Feb 24 21:42:12 2000
From: guido@python.org (Guido van Rossum)
Date: Thu, 24 Feb 2000 16:42:12 -0500
Subject: [Python-checkins] CVS: python/dist/src/Objects listobject.c,2.63,2.64
In-Reply-To: Your message of "Thu, 24 Feb 2000 13:20:07 PST."
 <Pine.LNX.4.10.10002241318150.28177-100000@nebula.lyra.org>
References: <Pine.LNX.4.10.10002241318150.28177-100000@nebula.lyra.org>
Message-ID: <200002242142.QAA10559@eric.cnri.reston.va.us>

> On a separate track, how about using the ":Name" form in the ParseTuple
> calls? It improves the error response a bit more...
> 
> Is that something you'd want to see in all the ParseTuple calls?

Ah, darn.  I tried ";message" but it's inferior; I'd forgotten about
":name".  Yes, that should be standard...  Patches, please?

--Guido van Rossum (home page: http://www.python.org/~guido/)


From guido@cnri.reston.va.us  Thu Feb 24 21:48:32 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 24 Feb 2000 16:48:32 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects listobject.c,2.64,2.65
Message-ID: <200002242148.QAA10690@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	listobject.c 
Log Message:
OKOK, Greg's right, I should've used the :name option in the argument
format strings.


Index: listobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/listobject.c,v
retrieving revision 2.64
retrieving revision 2.65
diff -C2 -r2.64 -r2.65
*** listobject.c	2000/02/24 15:23:03	2.64
--- listobject.c	2000/02/24 21:48:29	2.65
***************
*** 558,562 ****
  	int i;
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "iO", &i, &v))
  		return NULL;
  	return ins(self, i, v);
--- 558,562 ----
  	int i;
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "iO:insert", &i, &v))
  		return NULL;
  	return ins(self, i, v);
***************
*** 569,573 ****
  {
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	return ins(self, (int) self->ob_size, v);
--- 569,573 ----
  {
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "O:append", &v))
  		return NULL;
  	return ins(self, (int) self->ob_size, v);
***************
*** 585,589 ****
  	register int i;
  
! 	if (!PyArg_ParseTuple(args, "O", &b))
  		return NULL;
  
--- 585,589 ----
  	register int i;
  
! 	if (!PyArg_ParseTuple(args, "O:extend", &b))
  		return NULL;
  
***************
*** 652,656 ****
  	int i = -1;
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "|i", &i))
  		return NULL;
  	if (self->ob_size == 0) {
--- 652,656 ----
  	int i = -1;
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "|i:pop", &i))
  		return NULL;
  	if (self->ob_size == 0) {
***************
*** 1225,1229 ****
  
  	if (args != NULL) {
! 		if (!PyArg_ParseTuple(args, "|O", &compare))
  			return NULL;
  	}
--- 1225,1229 ----
  
  	if (args != NULL) {
! 		if (!PyArg_ParseTuple(args, "|O:sort", &compare))
  			return NULL;
  	}
***************
*** 1262,1266 ****
  	register PyObject *tmp;
  	
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 1262,1266 ----
  	register PyObject *tmp;
  	
! 	if (!PyArg_ParseTuple(args, ":reverse"))
  		return NULL;
  
***************
*** 1327,1331 ****
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
--- 1327,1331 ----
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O:index", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
***************
*** 1348,1352 ****
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
--- 1348,1352 ----
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O:count", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
***************
*** 1367,1371 ****
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
--- 1367,1371 ----
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O:remove", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {



From guido@cnri.reston.va.us  Fri Feb 25 11:44:06 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 06:44:06 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib cgi.py,1.45,1.46
Message-ID: <200002251144.GAA14998@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	cgi.py 
Log Message:
Fix a broken r.append(name, value) call, spotted by Tim.


Index: cgi.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/cgi.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** cgi.py	1999/06/11 18:26:09	1.45
--- cgi.py	2000/02/25 11:44:03	1.46
***************
*** 601,605 ****
          name = urllib.unquote(string.replace(nv[0], '+', ' '))
          value = urllib.unquote(string.replace(nv[1], '+', ' '))
!         r.append(name, value)
  
      return r
--- 601,605 ----
          name = urllib.unquote(string.replace(nv[0], '+', ' '))
          value = urllib.unquote(string.replace(nv[1], '+', ' '))
!         r.append((name, value))
  
      return r



From guido@cnri.reston.va.us  Fri Feb 25 11:46:53 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 06:46:53 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Demo/sgi/gl nurbs.py,1.3,1.4
Message-ID: <200002251146.GAA15023@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Demo/sgi/gl
In directory eric:/projects/python/develop/guido/src/Demo/sgi/gl

Modified Files:
	nurbs.py 
Log Message:
Fix a couple dozen broken ci.append(x, y, z) calls, spotted by Tim.


Index: nurbs.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Demo/sgi/gl/nurbs.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** nurbs.py	1996/11/27 19:49:54	1.3
--- nurbs.py	2000/02/25 11:46:50	1.4
***************
*** 24,52 ****
  	#
  	ci = []
! 	ci.append(-2.5,  -3.7,  1.0)
! 	ci.append(-1.5,  -3.7,  3.0)
! 	ci.append(1.5,  -3.7, -2.5)
! 	ci.append(2.5,  -3.7,  -0.75)
  	c.append(ci)
  	#
  	ci = []
! 	ci.append(-2.5,  -2.0,  3.0)
! 	ci.append(-1.5,  -2.0,  4.0)
! 	ci.append(1.5,  -2.0,  -3.0)
! 	ci.append(2.5,  -2.0,  0.0)
  	c.append(ci)
  	#
  	ci = []
! 	ci.append(-2.5, 2.0,  1.0)
! 	ci.append(-1.5, 2.0,  0.0)
! 	ci.append(1.5,  2.0,  -1.0)
! 	ci.append(2.5,  2.0,  2.0)
  	c.append(ci)
  	#
  	ci = []
! 	ci.append(-2.5,  2.7,  1.25)
! 	ci.append(-1.5,  2.7,  0.1)
! 	ci.append(1.5,  2.7,  -0.6)
! 	ci.append(2.5,  2.7,  0.2)
  	c.append(ci)
  	#
--- 24,52 ----
  	#
  	ci = []
! 	ci.append((-2.5,  -3.7,  1.0))
! 	ci.append((-1.5,  -3.7,  3.0))
! 	ci.append((1.5,  -3.7, -2.5))
! 	ci.append((2.5,  -3.7,  -0.75))
  	c.append(ci)
  	#
  	ci = []
! 	ci.append((-2.5,  -2.0,  3.0))
! 	ci.append((-1.5,  -2.0,  4.0))
! 	ci.append((1.5,  -2.0,  -3.0))
! 	ci.append((2.5,  -2.0,  0.0))
  	c.append(ci)
  	#
  	ci = []
! 	ci.append((-2.5, 2.0,  1.0))
! 	ci.append((-1.5, 2.0,  0.0))
! 	ci.append((1.5,  2.0,  -1.0))
! 	ci.append((2.5,  2.0,  2.0))
  	c.append(ci)
  	#
  	ci = []
! 	ci.append((-2.5,  2.7,  1.25))
! 	ci.append((-1.5,  2.7,  0.1))
! 	ci.append((1.5,  2.7,  -0.6))
! 	ci.append((2.5,  2.7,  0.2))
  	c.append(ci)
  	#
***************
*** 59,71 ****
  def make_trimpoints():
  	c = []
! 	c.append(1.0, 0.0, 1.0)
! 	c.append(1.0, 1.0, 1.0)
! 	c.append(0.0, 2.0, 2.0)
! 	c.append(-1.0, 1.0, 1.0)
! 	c.append(-1.0, 0.0, 1.0)
! 	c.append(-1.0, -1.0, 1.0)
! 	c.append(0.0, -2.0, 2.0)
! 	c.append(1.0, -1.0, 1.0) 
! 	c.append(1.0, 0.0, 1.0)
  	return c
  
--- 59,71 ----
  def make_trimpoints():
  	c = []
! 	c.append((1.0, 0.0, 1.0))
! 	c.append((1.0, 1.0, 1.0))
! 	c.append((0.0, 2.0, 2.0))
! 	c.append((-1.0, 1.0, 1.0))
! 	c.append((-1.0, 0.0, 1.0))
! 	c.append((-1.0, -1.0, 1.0))
! 	c.append((0.0, -2.0, 2.0))
! 	c.append((1.0, -1.0, 1.0) )
! 	c.append((1.0, 0.0, 1.0))
  	return c
  



From guido@cnri.reston.va.us  Fri Feb 25 11:48:45 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 06:48:45 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib asyncore.py,1.4,1.5
Message-ID: <200002251148.GAA15045@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	asyncore.py 
Log Message:
Fix a couple broken append() calls, spotted by Tim.


Index: asyncore.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/asyncore.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** asyncore.py	2000/02/04 15:39:29	1.4
--- asyncore.py	2000/02/25 11:48:42	1.5
***************
*** 103,107 ****
  				flags = flags | poll.POLLOUT
  			if flags:
! 				l.append (fd, flags)
  		r = poll.poll (l, timeout)
  		for fd, flags in r:
--- 103,107 ----
  				flags = flags | poll.POLLOUT
  			if flags:
! 				l.append ((fd, flags))
  		r = poll.poll (l, timeout)
  		for fd, flags in r:
***************
*** 395,403 ****
  	tbinfo = []
  	while 1:
! 		tbinfo.append (
  			tb.tb_frame.f_code.co_filename,
! 			tb.tb_frame.f_code.co_name,				
  			str(tb.tb_lineno)
! 			)
  		tb = tb.tb_next
  		if not tb:
--- 395,403 ----
  	tbinfo = []
  	while 1:
! 		tbinfo.append ((
  			tb.tb_frame.f_code.co_filename,
! 			tb.tb_frame.f_code.co_name,
  			str(tb.tb_lineno)
! 			))
  		tb = tb.tb_next
  		if not tb:



From fdrake@weyr.cnri.reston.va.us  Fri Feb 25 16:14:10 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 25 Feb 2000 11:14:10 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib getopt.py,1.9,1.10
Message-ID: <200002251614.LAA19469@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	getopt.py 
Log Message:

Gerrit Holl's patch to move attribution from the docstring to a
comment.  <gerrit@nl.linux.org>


Index: getopt.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/getopt.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** getopt.py	2000/02/04 15:39:29	1.9
--- getopt.py	2000/02/25 16:14:08	1.10
***************
*** 8,14 ****
  provides a single function and an exception:
  
- Gerrit Holl <gerrit@nl.linux.org> moved the string-based exceptions
- to class-based exceptions.
- 
  getopt() -- Parse command line options
  GetoptError -- exception (class) raised with 'opt' attribute, which is the
--- 8,11 ----
***************
*** 18,21 ****
--- 15,21 ----
  # Long option support added by Lars Wirzenius <liw@iki.fi>.
  
+ # Gerrit Holl <gerrit@nl.linux.org> moved the string-based exceptions
+ # to class-based exceptions.
+ 
  import string
  
***************
*** 82,86 ****
  def do_longs(opts, opt, longopts, args):
      try:
!         i = string.index(opt, '=')
          opt, optarg = opt[:i], opt[i+1:]
      except ValueError:
--- 82,86 ----
  def do_longs(opts, opt, longopts, args):
      try:
!         i = opt.index('=')
          opt, optarg = opt[:i], opt[i+1:]
      except ValueError:



From guido@cnri.reston.va.us  Fri Feb 25 16:34:13 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 11:34:13 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib getopt.py,1.10,1.11
Message-ID: <200002251634.LAA16476@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	getopt.py 
Log Message:
Gerrit forgot to remove the "import string".


Index: getopt.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/getopt.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** getopt.py	2000/02/25 16:14:08	1.10
--- getopt.py	2000/02/25 16:34:11	1.11
***************
*** 18,23 ****
  # to class-based exceptions.
  
- import string
- 
  class GetoptError(Exception):
      opt = ''
--- 18,21 ----



From guido@cnri.reston.va.us  Fri Feb 25 17:51:02 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 12:51:02 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules posixmodule.c,2.123,2.124
Message-ID: <200002251751.MAA19391@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/src/Modules

Modified Files:
	posixmodule.c 
Log Message:
Delete references to _SC_AIO_LIST_MAX; it appears that that symbol was
just a typo in some Linux header; the real symbol is
_SC_AIO_LISTIO_MAX.


Index: posixmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/posixmodule.c,v
retrieving revision 2.123
retrieving revision 2.124
diff -C2 -r2.123 -r2.124
*** posixmodule.c	2000/01/31 18:41:26	2.123
--- posixmodule.c	2000/02/25 17:51:00	2.124
***************
*** 3786,3792 ****
      {"SC_AIO_LISTIO_MAX",	_SC_AIO_LISTIO_MAX},
  #endif
- #ifdef _SC_AIO_LIST_MAX
-     {"SC_AIO_LIST_MAX",	_SC_AIO_LIST_MAX},
- #endif
  #ifdef _SC_AIO_MAX
      {"SC_AIO_MAX",	_SC_AIO_MAX},
--- 3786,3789 ----



From guido@cnri.reston.va.us  Fri Feb 25 19:25:07 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 14:25:07 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/test/output test_fork1,NONE,1.1
Message-ID: <200002251925.OAA19984@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/test/output
In directory eric:/projects/python/develop/guido/src/Lib/test/output

Added Files:
	test_fork1 
Log Message:
Test case for fork1() behavior.
Only the main thread should survive in the child after a fork().





From guido@cnri.reston.va.us  Fri Feb 25 19:25:31 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 14:25:31 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_fork1.py,NONE,1.1
Message-ID: <200002251925.OAA19995@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/test
In directory eric:/projects/python/develop/guido/src/Lib/test

Added Files:
	test_fork1.py 
Log Message:
Test case for fork1() behavior.
Only the main thread should survive in the child after a fork().





From guido@cnri.reston.va.us  Fri Feb 25 19:26:34 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 14:26:34 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src configure,1.107,1.108 configure.in,1.115,1.116
Message-ID: <200002251926.OAA20017@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src
In directory eric:/projects/python/develop/guido/src

Modified Files:
	configure configure.in 
Log Message:
Pat Knight:

Solaris 2 has stub implementations of the POSIX thread functions such as 
pthread_detach in libc. This means that configure tries to use them without 
-lpthread, then the test of pthread_create fails and the configuration 
falls back to the Solaris thread library. This patch moves the test for 
pthread_create in -lpthread ahead of the test for pthread_detach in libc. 
The patch also ensures that -lpthread is at the start of the library list 
when linking, to pick up POSIX thread semantics for fork (see below).

Justification.
Use of POSIX threads on Solaris ensures that the fork() call only runs the 
thread that called fork() in the child. This is desirable to prevent (for 
example) parent server or database threads running in the child. Sun's 
-lthread library uses a traditional fork() which replicates all the 
parent's threads in the child. I find this undesirable.

Digression.
The configure.in seems to always test for -lthread even if a POSIX library 
is found. I'm not enough of a configure.in wizard to decide whether this is 
desirable or how to fix it. It is also irrelevant to this patch - I just 
spotted it while testing.
End of Digression.



Index: configure
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -r1.107 -r1.108
*** configure	2000/02/03 13:50:24	1.107
--- configure	2000/02/25 19:26:30	1.108
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.115 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.116 
  
  # Guess values for system-dependent variables and create Makefiles.
***************
*** 2733,2743 ****
    echo "$ac_t""no" 1>&6
  
  echo $ac_n "checking for pthread_detach""... $ac_c" 1>&6
! echo "configure:2737: checking for pthread_detach" >&5
  if eval "test \"`echo '$''{'ac_cv_func_pthread_detach'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2742 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 2733,2791 ----
    echo "$ac_t""no" 1>&6
  
+ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+ echo "configure:2737: checking for pthread_create in -lpthread" >&5
+ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthread  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2745 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char pthread_create();
+ 
+ int main() {
+ pthread_create()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+ rm -f conftest*
+ LIBS="$ac_save_LIBS"
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   cat >> confdefs.h <<\EOF
+ #define WITH_THREAD 1
+ EOF
+ 
+ cat >> confdefs.h <<\EOF
+ #define _POSIX_THREADS 1
+ EOF
+ 
+ LIBS="-lpthread $LIBS"
+ LIBOBJS="$LIBOBJS thread.o"
+ else
+   echo "$ac_t""no" 1>&6
+ 
  echo $ac_n "checking for pthread_detach""... $ac_c" 1>&6
! echo "configure:2785: checking for pthread_detach" >&5
  if eval "test \"`echo '$''{'ac_cv_func_pthread_detach'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2790 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 2762,2766 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_pthread_detach=yes"
--- 2810,2814 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_pthread_detach=yes"
***************
*** 2790,2804 ****
  ac_safe=`echo "kernel/OS.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for kernel/OS.h""... $ac_c" 1>&6
! echo "configure:2793: checking for kernel/OS.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2798 "configure"
  #include "confdefs.h"
  #include <kernel/OS.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 2838,2852 ----
  ac_safe=`echo "kernel/OS.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for kernel/OS.h""... $ac_c" 1>&6
! echo "configure:2841: checking for kernel/OS.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2846 "configure"
  #include "confdefs.h"
  #include <kernel/OS.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 2829,2833 ****
  
  echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
! echo "configure:2832: checking for pthread_create in -lpthreads" >&5
  ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 2877,2881 ----
  
  echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
! echo "configure:2880: checking for pthread_create in -lpthreads" >&5
  ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 2837,2888 ****
  LIBS="-lpthreads  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2840 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char pthread_create();
- 
- int main() {
- pthread_create()
- ; return 0; }
- EOF
- if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
- rm -f conftest*
- LIBS="$ac_save_LIBS"
- 
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   cat >> confdefs.h <<\EOF
- #define WITH_THREAD 1
- EOF
- 
- cat >> confdefs.h <<\EOF
- #define _POSIX_THREADS 1
- EOF
- 
- LIBS="$LIBS -lpthreads"
- LIBOBJS="$LIBOBJS thread.o"
- else
-   echo "$ac_t""no" 1>&6
- 
- echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
- echo "configure:2880: checking for pthread_create in -lpthread" >&5
- ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-lpthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
  #line 2888 "configure"
  #include "confdefs.h"
--- 2885,2888 ----
***************
*** 2919,2923 ****
  EOF
  
! LIBS="$LIBS -lpthread"
  LIBOBJS="$LIBOBJS thread.o"
  else
--- 2919,2923 ----
  EOF
  
! LIBS="$LIBS -lpthreads"
  LIBOBJS="$LIBOBJS thread.o"
  else

Index: configure.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -r1.115 -r1.116
*** configure.in	2000/02/03 13:42:50	1.115
--- configure.in	2000/02/25 19:26:31	1.116
***************
*** 1,4 ****
  dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.115 $)
  AC_PREREQ(2.0)
  AC_INIT(Include/object.h)
--- 1,4 ----
  dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.116 $)
  AC_PREREQ(2.0)
  AC_INIT(Include/object.h)
***************
*** 648,651 ****
--- 648,655 ----
  AC_DEFINE(C_THREADS)
  LIBOBJS="$LIBOBJS thread.o"],[
+ AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
+ AC_DEFINE(_POSIX_THREADS)
+ LIBS="-lpthread $LIBS"
+ LIBOBJS="$LIBOBJS thread.o"],[
  AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
  AC_DEFINE(_POSIX_THREADS)
***************
*** 657,664 ****
  AC_DEFINE(_POSIX_THREADS)
  LIBS="$LIBS -lpthreads"
- LIBOBJS="$LIBOBJS thread.o"], [
- AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
- AC_DEFINE(_POSIX_THREADS)
- LIBS="$LIBS -lpthread"
  LIBOBJS="$LIBOBJS thread.o"], [
  AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
--- 661,664 ----



From bwarsaw@cnri.reston.va.us  Fri Feb 25 21:54:21 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw)
Date: Fri, 25 Feb 2000 16:54:21 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/lib-tk Tkinter.py,1.134,1.135
Message-ID: <200002252154.QAA00827@anthem.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/lib-tk
In directory anthem:/home/bwarsaw/projects/python/Lib/lib-tk

Modified Files:
	Tkinter.py 
Log Message:
Changes inspired by Randall Hooper to allow callbacks when an
OptionMenu is modified.  Somewhat rewritten and elaborated by myself.

class _setit: The constructor now takes an optional argument
`callback' and stashes this in a private variable.  If set, the
__call__() method will invoke this callback after the variable's value
has changed.  It will pass the callback the value, followed by any
args passed to __call__().

class OptionMenu: The constructor now takes keyword arguments, the
only one that's legally recognized is `command', which can be set to a
callback.  This callback is invoked when the OptionMenu value is set.
Any other keyword argument throws a TclError.


Index: Tkinter.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/lib-tk/Tkinter.py,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -r1.134 -r1.135
*** Tkinter.py	1999/10/20 12:29:56	1.134
--- Tkinter.py	2000/02/25 21:54:19	1.135
***************
*** 1,5 ****
  # Tkinter.py -- Tk/Tcl widget wrappers
  
! __version__ = "$Revision: 1.134 $"
  
  import sys
--- 1,5 ----
  # Tkinter.py -- Tk/Tcl widget wrappers
  
! __version__ = "$Revision: 1.135 $"
  
  import sys
***************
*** 1791,1802 ****
  
  class _setit:
! 	def __init__(self, var, value):
  		self.__value = value
  		self.__var = var
  	def __call__(self, *args):
  		self.__var.set(self.__value)
  
  class OptionMenu(Menubutton):
! 	def __init__(self, master, variable, value, *values):
  		kw = {"borderwidth": 2, "textvariable": variable,
  		      "indicatoron": 1, "relief": RAISED, "anchor": "c",
--- 1791,1805 ----
  
  class _setit:
! 	def __init__(self, var, value, callback=None):
  		self.__value = value
  		self.__var = var
+ 		self.__callback = callback
  	def __call__(self, *args):
  		self.__var.set(self.__value)
+ 		if self.__callback:
+ 			apply(self.__callback, (self.__value,)+args)
  
  class OptionMenu(Menubutton):
! 	def __init__(self, master, variable, value, *values, **kwargs):
  		kw = {"borderwidth": 2, "textvariable": variable,
  		      "indicatoron": 1, "relief": RAISED, "anchor": "c",
***************
*** 1806,1812 ****
  		menu = self.__menu = Menu(self, name="menu", tearoff=0)
  		self.menuname = menu._w
! 		menu.add_command(label=value, command=_setit(variable, value))
  		for v in values:
! 			menu.add_command(label=v, command=_setit(variable, v))
  		self["menu"] = menu
  
--- 1809,1823 ----
  		menu = self.__menu = Menu(self, name="menu", tearoff=0)
  		self.menuname = menu._w
! 		# 'command' is the only supported keyword
! 		callback = kwargs.get('command')
! 		if kwargs.has_key('command')
! 			del kwargs['command']
! 		if kwargs:
! 			raise TclError, 'unknown option -'+kwargs.keys()[0]
! 		menu.add_command(label=value,
! 				 command=_setit(variable, value, callback))
  		for v in values:
! 			menu.add_command(label=v,
! 					 command=_setit(variable, v, callback))
  		self["menu"] = menu
  



From akuchlin@CNRI.Reston.VA.US  Fri Feb 25 22:23:34 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Fri, 25 Feb 2000 17:23:34 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules mpzmodule.c,2.21,2.22
Message-ID: <200002252223.RAA15673@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory amarok:/home/akuchlin/src/Python-1.5/Modules

Modified Files:
	mpzmodule.c 
Log Message:
Better fix for mpzmodule problem reported by Peter Funk: just use
    mp_bits_per_limb with GMP 2.0


Index: mpzmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/mpzmodule.c,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -r2.21 -r2.22
*** mpzmodule.c	2000/02/24 15:26:30	2.21
--- mpzmodule.c	2000/02/25 22:23:31	2.22
***************
*** 94,107 ****
  #include "gmp.h"
  
- #if defined __GLIBC__ && __GLIBC__ >= 2 /*aid building on Linux distributions*/
- #define BITS_PER_MP_LIMB mp_bits_per_limb
- #else
- #include "gmp-mparam.h"
- #endif
- 
  #if __GNU_MP__ + 0 == 2
  #define GMP2
  #else
  #define MPZ_GET_STR_BUG
  #endif
  
--- 94,103 ----
  #include "gmp.h"
  
  #if __GNU_MP__ + 0 == 2
  #define GMP2
+ #define BITS_PER_MP_LIMB mp_bits_per_limb
  #else
  #define MPZ_GET_STR_BUG
+ #include "gmp-mparam.h"
  #endif
  



From bwarsaw@cnri.reston.va.us  Sat Feb 26 20:56:50 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw)
Date: Sat, 26 Feb 2000 15:56:50 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/i18n pygettext.py,1.5,1.6
Message-ID: <200002262056.PAA28644@anthem.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/i18n
In directory anthem:/home/bwarsaw/projects/python/Tools/i18n

Modified Files:
	pygettext.py 
Log Message:
Changes submitted by Peter Funk (some fixes/additions by B.Warsaw) to
make pygettext more compatible with GNU xgettext, specifically:

Added -E/--escape for allowing pass-thru of iso8859-1 characters above
7 bits.

Added -o/--output option for renaming the output file from
messages.pot (there's overlap with -d/--default-domain, but GNU
xgettext has them both).

Added -p/--output-dir for specifying the output directory for
messages.pot.

Added -V/--version for printing the version number.

Added -w/--width for specifying the output page width (this is because
now pygettext, like GNU xgettext will put several locations on the
same line to cut down on vertical space).

Added -x/--exclude-file for specifying a list of strings that are not
to be extracted from the input files.

Bumped version number to 1.0

Try to import fintl and use fintl.gettext as _ if available.  Fall
back is to use identity definition of _().

Moved the escape creation to a function make_escapes() so that its
behavior can be controlled by the -E option.

__openseen(): Support the -x option.

write(): Support -w option and vertical space preserving feature.

main(): Support new options.


Index: pygettext.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/i18n/pygettext.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pygettext.py	1999/12/06 02:46:49	1.5
--- pygettext.py	2000/02/26 20:56:47	1.6
***************
*** 1,4 ****
--- 1,7 ----
  #! /usr/bin/env python
  # Originally written by Barry Warsaw <bwarsaw@python.org>
+ #
+ # minimally patched to make it even more xgettext compatible 
+ # by Peter Funk <pf@artcom-gmbh.de>
  
  """pygettext -- Python equivalent of xgettext(1)
***************
*** 36,40 ****
  
  NOTE: pygettext attempts to be option and feature compatible with GNU xgettext
! where ever possible.
  
  Usage: pygettext [options] filename ...
--- 39,44 ----
  
  NOTE: pygettext attempts to be option and feature compatible with GNU xgettext
! where ever possible.  However some options are still missing or are not fully
! implemented.
  
  Usage: pygettext [options] filename ...
***************
*** 45,52 ****
      --extract-all
          Extract all strings
  
!     -d default-domain
!     --default-domain=default-domain
!         Rename the default output file from messages.pot to default-domain.pot 
  
      -k [word]
--- 49,64 ----
      --extract-all
          Extract all strings
+ 
+     -d name
+     --default-domain=name
+         Rename the default output file from messages.pot to name.pot 
+ 
+     -E
+     --escape
+         replace non-ASCII characters with octal escape sequences.
  
!     -h
!     --help
!         print this help message and exit
  
      -k [word]
***************
*** 74,84 ****
          insensitive.  By default, locations are included.
  
      -v
      --verbose
          Print the names of the files being processed.
  
!     --help
!     -h
!         print this help message and exit
  
  """
--- 86,114 ----
          insensitive.  By default, locations are included.
  
+     -o filename
+     --output=filename
+         Rename the default output file from messages.pot to filename.
+ 
+     -p dir
+     --output-dir=dir
+         Output files will be placed in directory dir.
+ 
      -v
      --verbose
          Print the names of the files being processed.
  
!     -V
!     --version
!         Print the version of pygettext and exit.
! 
!     -w columns
!     --width=columns
!         Set width of output to columns.
! 
!     -x filename
!     --exclude-file=filename
!         Specify a file that contains a list of strings that are not be
!         extracted from the input files.  Each string to be excluded must
!         appear on a line by itself in the file.
  
  """
***************
*** 91,100 ****
  import tokenize
  
! __version__ = '0.2'
  
  
  
  # for selftesting
! def _(s): return s
  
  
--- 121,134 ----
  import tokenize
  
! __version__ = '1.0'
  
  
  
  # for selftesting
! try:
!     import fintl
!     _ = fintl.gettext
! except ImportError:
!     def _(s): return s
  
  
***************
*** 126,144 ****
      sys.exit(code)
  
  
  escapes = []
- for i in range(256):
-     if i < 32 or i > 127:
-         escapes.append("\\%03o" % i)
-     else:
-         escapes.append(chr(i))
  
! escapes[ord('\\')] = '\\\\'
! escapes[ord('\t')] = '\\t'
! escapes[ord('\r')] = '\\r'
! escapes[ord('\n')] = '\\n'
! escapes[ord('\"')] = '\\"'
  
  def escape(s):
      s = list(s)
      for i in range(len(s)):
--- 160,188 ----
      sys.exit(code)
  
+ 
  
  escapes = []
  
! def make_escapes(pass_iso8859):
!     global escapes
!     for i in range(256):
!         if pass_iso8859:
!             # Allow iso-8859 characters to pass through so that e.g. 'msgid
!             # "Höhe"' would result not result in 'msgid "H\366he"'.  Otherwise
!             # we escape any character outside the 32..126 range.
!             i = i % 128
!         if 32 <= i <= 126:
!             escapes.append(chr(i))
!         else:
!             escapes.append("\\%03o" % i)
!     escapes[ord('\\')] = '\\\\'
!     escapes[ord('\t')] = '\\t'
!     escapes[ord('\r')] = '\\r'
!     escapes[ord('\n')] = '\\n'
!     escapes[ord('\"')] = '\\"'
  
+ 
  def escape(s):
+     global escapes
      s = list(s)
      for i in range(len(s)):
***************
*** 201,210 ****
              if self.__data:
                  msg = string.join(self.__data, '')
!                 entry = (self.__curfile, self.__lineno)
!                 linenos = self.__messages.get(msg)
!                 if linenos is None:
!                     self.__messages[msg] = [entry]
!                 else:
!                     linenos.append(entry)
              self.__state = self.__waiting
          elif ttype == tokenize.STRING:
--- 245,255 ----
              if self.__data:
                  msg = string.join(self.__data, '')
!                 if not msg in self.__options.toexclude:
!                     entry = (self.__curfile, self.__lineno)
!                     linenos = self.__messages.get(msg)
!                     if linenos is None:
!                         self.__messages[msg] = [entry]
!                     else:
!                         linenos.append(entry)
              self.__state = self.__waiting
          elif ttype == tokenize.STRING:
***************
*** 223,240 ****
              # The time stamp in the header doesn't have the same format
              # as that generated by xgettext...
!             print pot_header % {'time': timestamp, 'version':__version__}
              for k, v in self.__messages.items():
!                 for filename, lineno in v:
!                     # location comments are different b/w Solaris and GNU
!                     d = {'filename': filename,
!                          'lineno': lineno}
!                     if options.location == options.SOLARIS:
                          print _('# File: %(filename)s, line: %(lineno)d') % d
!                     elif options.location == options.GNU:
!                         print _('#: %(filename)s:%(lineno)d') % d
                  # TBD: sorting, normalizing
                  print 'msgid', normalize(k)
!                 print 'msgstr ""'
!                 print
          finally:
              sys.stdout = sys.__stdout__
--- 268,295 ----
              # The time stamp in the header doesn't have the same format
              # as that generated by xgettext...
!             print pot_header % {'time': timestamp, 'version': __version__}
              for k, v in self.__messages.items():
!                 # location comments are different b/w Solaris and GNU:
!                 if options.location == options.SOLARIS:
!                     for filename, lineno in v:
!                         d = {'filename': filename, 'lineno': lineno}
                          print _('# File: %(filename)s, line: %(lineno)d') % d
!                 elif options.location == options.GNU:
!                     # fit as many locations on one line, as long as the
!                     # resulting line length doesn't exceeds 'options.width'
!                     locline = '#:'
!                     for filename, lineno in v:
!                         d = {'filename': filename, 'lineno': lineno}
!                         s = _(' %(filename)s:%(lineno)d') % d
!                         if len(locline) + len(s) <= options.width:
!                             locline = locline + s
!                         else:
!                             print locline
!                             locline = "#:" + s
!                     if len(locline) > 2:
!                         print locline
                  # TBD: sorting, normalizing
                  print 'msgid', normalize(k)
!                 print 'msgstr ""\n'
          finally:
              sys.stdout = sys.__stdout__
***************
*** 246,252 ****
          opts, args = getopt.getopt(
              sys.argv[1:],
!             'k:d:n:hv',
!             ['keyword', 'default-domain', 'help',
!              'add-location=', 'no-location', 'verbose'])
      except getopt.error, msg:
          usage(1, msg)
--- 301,309 ----
          opts, args = getopt.getopt(
              sys.argv[1:],
!             'ad:Ehk:n:o:p:Vvw:x:',
!             ['extract-all', 'default-domain', 'escape', 'help', 'keyword',
!              'add-location', 'no-location', 'output=', 'output-dir=',
!              'verbose', 'version', 'width=', 'exclude-file=',
!              ])
      except getopt.error, msg:
          usage(1, msg)
***************
*** 258,265 ****
--- 315,327 ----
          SOLARIS = 2
          # defaults
+         extractall = 0 # FIXME: currently this option has no effect at all.
+         escape = 0
          keywords = []
+         outpath = ''
          outfile = 'messages.pot'
          location = GNU
          verbose = 0
+         width = 78
+         excludefilename = ''
  
      options = Options()
***************
*** 272,281 ****
          if opt in ('-h', '--help'):
              usage(0)
          elif opt in ('-k', '--keyword'):
              if arg is None:
                  default_keywords = []
              options.keywords.append(arg)
-         elif opt in ('-d', '--default-domain'):
-             options.outfile = arg + '.pot'
          elif opt in ('-n', '--add-location'):
              if arg is None:
--- 334,347 ----
          if opt in ('-h', '--help'):
              usage(0)
+         elif opt in ('-a', '--extract-all'):
+             options.extractall = 1
+         elif opt in ('-d', '--default-domain'):
+             options.outfile = arg + '.pot'
+         elif opt in ('-E', '--escape'):
+             options.escape = 1
          elif opt in ('-k', '--keyword'):
              if arg is None:
                  default_keywords = []
              options.keywords.append(arg)
          elif opt in ('-n', '--add-location'):
              if arg is None:
***************
*** 288,297 ****
--- 354,395 ----
          elif opt in ('--no-location',):
              options.location = 0
+         elif opt in ('-o', '--output'):
+             options.outfile = arg
+         elif opt in ('-p', '--output-dir'):
+             options.outpath = arg
          elif opt in ('-v', '--verbose'):
              options.verbose = 1
+         elif opt in ('-V', '--version'):
+             print _('pygettext.py (xgettext for Python) %s') % __version__
+             sys.exit(0)
+         elif opt in ('-w', '--width'):
+             try:
+                 options.width = int(arg)
+             except ValueError:
+                 d = {'arg':arg}
+                 usage(1, _('Invalid value for --width: %(arg)s, must be int')
+                       % d)
+         elif opt in ('-x', '--exclude-file'):
+             options.excludefilename = arg
+ 
+     # calculate escapes
+     make_escapes(options.escapes)
  
      # calculate all keywords
      options.keywords.extend(default_keywords)
  
+     # initialize list of strings to exclude
+     if options.excludefilename:
+         try:
+             fp = open(options.excludefilename)
+             options.toexclude = fp.readlines()
+             fp.close()
+         except IOError:
+             sys.stderr.write(_("Can't read --exclude-file: %s") %
+                              options.excludefilename)
+             sys.exit(1)
+     else:
+         options.toexclude = []
+ 
      # slurp through all the files
      eater = TokenEater(options)
***************
*** 304,307 ****
--- 402,407 ----
          fp.close()
  
+     if options.outpath:
+         options.outfile = os.path.join(options.outpath, options.outfile)
      fp = open(options.outfile, 'w')
      eater.write(fp)



From bwarsaw@cnri.reston.va.us  Sun Feb 27 14:30:51 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw)
Date: Sun, 27 Feb 2000 09:30:51 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/i18n pygettext.py,1.6,1.7
Message-ID: <200002271430.JAA01096@anthem.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/i18n
In directory anthem:/home/bwarsaw/projects/python/Tools/i18n

Modified Files:
	pygettext.py 
Log Message:
Two buglet fixes.  Peter Funk caught the bug in make_escapes:

    This will fold all ISO 8859 chars from the upper half of the
    charset into the lower half, which is ...ummm.... unintened.

The second is a typo in the reference to options.escape in main().


Index: pygettext.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/i18n/pygettext.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pygettext.py	2000/02/26 20:56:47	1.6
--- pygettext.py	2000/02/27 14:30:48	1.7
***************
*** 166,176 ****
  def make_escapes(pass_iso8859):
      global escapes
      for i in range(256):
!         if pass_iso8859:
!             # Allow iso-8859 characters to pass through so that e.g. 'msgid
!             # "Höhe"' would result not result in 'msgid "H\366he"'.  Otherwise
!             # we escape any character outside the 32..126 range.
!             i = i % 128
!         if 32 <= i <= 126:
              escapes.append(chr(i))
          else:
--- 166,178 ----
  def make_escapes(pass_iso8859):
      global escapes
+     if pass_iso8859:
+         # Allow iso-8859 characters to pass through so that e.g. 'msgid
+         # "Höhe"' would result not result in 'msgid "H\366he"'.  Otherwise we
+         # escape any character outside the 32..126 range.
+         mod = 128
+     else:
+         mod = 256
      for i in range(256):
!         if 32 <= (i % mod) <= 126:
              escapes.append(chr(i))
          else:
***************
*** 374,378 ****
  
      # calculate escapes
!     make_escapes(options.escapes)
  
      # calculate all keywords
--- 376,380 ----
  
      # calculate escapes
!     make_escapes(options.escape)
  
      # calculate all keywords



From guido@cnri.reston.va.us  Sun Feb 27 15:34:32 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Sun, 27 Feb 2000 10:34:32 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/lib-old fmt.py,1.4,1.5
Message-ID: <200002271534.KAA21694@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/lib-old
In directory eric:/projects/python/develop/guido/src/Lib/lib-old

Modified Files:
	fmt.py 
Log Message:
Fixed a multi-arg append() call, discovered by Mark Favas.
Also removed some unnecessary backslases (inside parens).


Index: fmt.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/lib-old/fmt.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** fmt.py	1997/10/22 20:57:37	1.4
--- fmt.py	2000/02/27 15:34:29	1.5
***************
*** 223,229 ****
  			self.nextfont = self.font
  		space = int(space * self.space)
! 		self.para.words.append(self.nextfont, text, \
! 			self.d.textwidth(text), space, space, \
! 			self.ascent, self.descent)
  		self.nextfont = None
  	#
--- 223,229 ----
  			self.nextfont = self.font
  		space = int(space * self.space)
! 		self.para.words.append((self.nextfont, text,
! 			self.d.textwidth(text), space, space,
! 			self.ascent, self.descent))
  		self.nextfont = None
  	#
***************
*** 500,504 ****
  				hit = long1, long2
  				self.setselection(hit)
! 				self.window.show( \
  					(p.left, p.top), (p.right, p.bottom))
  				break
--- 500,504 ----
  				hit = long1, long2
  				self.setselection(hit)
! 				self.window.show(
  					(p.left, p.top), (p.right, p.bottom))
  				break



From guido@cnri.reston.va.us  Sun Feb 27 15:35:50 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Sun, 27 Feb 2000 10:35:50 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/lib-tk Tkinter.py,1.135,1.136
Message-ID: <200002271535.KAA21724@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/lib-tk
In directory eric:/projects/python/develop/guido/src/Lib/lib-tk

Modified Files:
	Tkinter.py 
Log Message:
Fix a typo in Barry's checkin.
Reported both by Gerrit Holl and Mark Favas.


Index: Tkinter.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/lib-tk/Tkinter.py,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -r1.135 -r1.136
*** Tkinter.py	2000/02/25 21:54:19	1.135
--- Tkinter.py	2000/02/27 15:35:47	1.136
***************
*** 1,5 ****
  # Tkinter.py -- Tk/Tcl widget wrappers
  
! __version__ = "$Revision: 1.135 $"
  
  import sys
--- 1,5 ----
  # Tkinter.py -- Tk/Tcl widget wrappers
  
! __version__ = "$Revision: 1.136 $"
  
  import sys
***************
*** 1811,1815 ****
  		# 'command' is the only supported keyword
  		callback = kwargs.get('command')
! 		if kwargs.has_key('command')
  			del kwargs['command']
  		if kwargs:
--- 1811,1815 ----
  		# 'command' is the only supported keyword
  		callback = kwargs.get('command')
! 		if kwargs.has_key('command'):
  			del kwargs['command']
  		if kwargs:



From guido@cnri.reston.va.us  Mon Feb 28 14:27:10 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 09:27:10 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib posixpath.py,1.28,1.29
Message-ID: <200002281427.JAA22692@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	posixpath.py 
Log Message:
Patch by Gerrit Holl to avoid doing two stat() calls in a row in walk().


Index: posixpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/posixpath.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** posixpath.py	2000/02/24 02:26:51	1.28
--- posixpath.py	2000/02/28 14:27:07	1.29
***************
*** 268,272 ****
          if name not in exceptions:
              name = join(top, name)
!             if isdir(name) and not islink(name):
                  walk(name, func, arg)
  
--- 268,273 ----
          if name not in exceptions:
              name = join(top, name)
!             st = os.lstat(name)
!             if stat.S_ISDIR(st[stat.ST_MODE]):
                  walk(name, func, arg)
  



From guido@cnri.reston.va.us  Mon Feb 28 15:00:43 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 10:00:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Include object.h,2.48,2.49
Message-ID: <200002281500.KAA22995@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Include
In directory eric:/projects/python/develop/guido/src/Include

Modified Files:
	object.h 
Log Message:
Patch by Mozhe Zadka, for __contains__ (overloading 'in').  This adds
a new proc type (objobjproc), a new slot sq_contains to
PySequenceMethods, and a new flag Py_TPFLAGS_HAVE_SEQUENCE_IN to
Py_TPFLAGS_DEFAULT.  More to follow.


Index: object.h
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Include/object.h,v
retrieving revision 2.48
retrieving revision 2.49
diff -C2 -r2.48 -r2.49
*** object.h	2000/01/20 22:32:45	2.48
--- object.h	2000/02/28 15:00:40	2.49
***************
*** 151,154 ****
--- 151,155 ----
  typedef int (*getsegcountproc) Py_PROTO((PyObject *, int *));
  typedef int (*getcharbufferproc) Py_PROTO((PyObject *, int, const char **));
+ typedef int (*objobjproc) Py_PROTO((PyObject *, PyObject *));
  
  typedef struct {
***************
*** 186,189 ****
--- 187,191 ----
  	intobjargproc sq_ass_item;
  	intintobjargproc sq_ass_slice;
+ 	objobjproc sq_contains;
  } PySequenceMethods;
  
***************
*** 318,322 ****
  #define Py_TPFLAGS_HAVE_GETCHARBUFFER  (1L<<0)
  
! #define Py_TPFLAGS_DEFAULT  (Py_TPFLAGS_HAVE_GETCHARBUFFER)
  
  #define PyType_HasFeature(t,f)  (((t)->tp_flags & (f)) != 0)
--- 320,328 ----
  #define Py_TPFLAGS_HAVE_GETCHARBUFFER  (1L<<0)
  
! /* PySequenceMethods contains sq_contains */
! #define Py_TPFLAGS_HAVE_SEQUENCE_IN (1L<<1)
! 
! #define Py_TPFLAGS_DEFAULT  (Py_TPFLAGS_HAVE_GETCHARBUFFER | \
!                              Py_TPFLAGS_HAVE_SEQUENCE_IN)
  
  #define PyType_HasFeature(t,f)  (((t)->tp_flags & (f)) != 0)



From guido@cnri.reston.va.us  Mon Feb 28 15:01:49 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 10:01:49 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects abstract.c,2.30,2.31
Message-ID: <200002281501.KAA23017@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	abstract.c 
Log Message:
Patch by Mozhe Zadka, for __contains__ (overloading 'in').  This
patches PySequence_Contains() to check for a valid sq_contains field.
More to follow.


Index: abstract.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/abstract.c,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -r2.30 -r2.31
*** abstract.c	2000/02/23 22:21:50	2.30
--- abstract.c	2000/02/28 15:01:46	2.31
***************
*** 1140,1144 ****
  		return 0;
  	}
! 
  	sq = w->ob_type->tp_as_sequence;
  	if (sq == NULL || sq->sq_item == NULL) {
--- 1140,1151 ----
  		return 0;
  	}
! 	if(PyType_HasFeature(w->ob_type, Py_TPFLAGS_HAVE_SEQUENCE_IN)) {
! 		sq = w->ob_type->tp_as_sequence;
! 	        if(sq != NULL && sq->sq_contains != NULL)
! 			return (*sq->sq_contains)(w, v);
! 	}
! 	
! 	/* If there is no better way to check whether an item is is contained,
! 	   do it the hard way */
  	sq = w->ob_type->tp_as_sequence;
  	if (sq == NULL || sq->sq_item == NULL) {



From guido@cnri.reston.va.us  Mon Feb 28 15:03:17 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 10:03:17 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects classobject.c,2.82,2.83
Message-ID: <200002281503.KAA23038@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	classobject.c 
Log Message:
Patch by Mozhe Zadka, for __contains__ (overloading 'in').  This adds
an instance method instance_contains as sq_contains.  It looks for
__contains__ and if not found falls back to previous behaviour.
Done.


Index: classobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/classobject.c,v
retrieving revision 2.82
retrieving revision 2.83
diff -C2 -r2.82 -r2.83
*** classobject.c	2000/01/20 22:32:54	2.82
--- classobject.c	2000/02/28 15:03:15	2.83
***************
*** 1066,1069 ****
--- 1066,1122 ----
  }
  
+ static int instance_contains(PyInstanceObject *inst, PyObject *member)
+ {
+ 	static PyObject *__contains__;
+ 	PyObject *func, *arg, *res;
+ 	int ret;
+ 
+ 	if(__contains__ == NULL) {
+ 		__contains__ = PyString_InternFromString("__contains__");
+ 		if(__contains__ == NULL)
+ 			return -1;
+ 	}
+ 	func = instance_getattr(inst, __contains__);
+ 	if(func == NULL) {
+ 		/* fall back to previous behaviour */
+ 		int i, cmp_res;
+ 
+ 		if(!PyErr_ExceptionMatches(PyExc_AttributeError))
+ 			return -1;
+ 		PyErr_Clear();
+ 		for(i=0;;i++) {
+ 			PyObject *obj = instance_item(inst, i);
+ 			int ret = 0;
+ 
+ 			if(obj == NULL) {
+ 				if(!PyErr_ExceptionMatches(PyExc_IndexError))
+ 					return -1;
+ 				PyErr_Clear();
+ 				return 0;
+ 			}
+ 			if(PyObject_Cmp(obj, member, &cmp_res) == -1)
+ 				ret = -1;
+ 			if(cmp_res == 0) 
+ 				ret = 1;
+ 			Py_DECREF(obj);
+ 			if(ret)
+ 				return ret;
+ 		}
+ 	}
+ 	arg = Py_BuildValue("(O)", member);
+ 	if(arg == NULL) {
+ 		Py_DECREF(func);
+ 		return -1;
+ 	}
+ 	res = PyEval_CallObject(func, arg);
+ 	Py_DECREF(func);
+ 	Py_DECREF(arg);
+ 	if(res == NULL) 
+ 		return -1;
+ 	ret = PyObject_IsTrue(res);
+ 	Py_DECREF(res);
+ 	return ret;
+ }
+ 
  static PySequenceMethods instance_as_sequence = {
  	(inquiry)instance_length, /*sq_length*/
***************
*** 1074,1077 ****
--- 1127,1131 ----
  	(intobjargproc)instance_ass_item, /*sq_ass_item*/
  	(intintobjargproc)instance_ass_slice, /*sq_ass_slice*/
+ 	(objobjproc)instance_contains, /* sq_contains */
  };
  
***************
*** 1406,1409 ****
--- 1460,1465 ----
  	(getattrofunc)instance_getattr, /*tp_getattro*/
  	(setattrofunc)instance_setattr, /*tp_setattro*/
+         0, /* tp_as_buffer */
+ 	Py_TPFLAGS_DEFAULT, /*tp_flags */
  };
  



From guido@cnri.reston.va.us  Mon Feb 28 15:12:29 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 10:12:29 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib StringIO.py,1.8,1.9 cgi.py,1.46,1.47 code.py,1.8,1.9 ftplib.py,1.40,1.41 getpass.py,1.8,1.9 imaplib.py,1.16,1.17 poplib.py,1.6,1.7 smtplib.py,1.21,1.22 whrandom.py,1.15,1.16
Message-ID: <200002281512.KAA23140@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	StringIO.py cgi.py code.py ftplib.py getpass.py imaplib.py 
	poplib.py smtplib.py whrandom.py 
Log Message:
Simple changes by Gerrit Holl - move author acknowledgements out of
docstrings into comments.



Index: StringIO.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/StringIO.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** StringIO.py	2000/02/02 15:10:14	1.8
--- StringIO.py	2000/02/28 15:12:25	1.9
***************
*** 20,23 ****
--- 20,25 ----
  Notes:
  - Using a real file is often faster (but less convenient).
+ - There's also a much faster implementation in C, called cStringIO, but
+   it's not subclassable.
  - fileno() is left unimplemented so that code which uses it triggers
    an exception early.

Index: cgi.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/cgi.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** cgi.py	2000/02/25 11:44:03	1.46
--- cgi.py	2000/02/28 15:12:25	1.47
***************
*** 400,419 ****
  most systems, and is a security liability as well.
  
! 
! History
! -------
! 
! Michael McLay started this module.  Steve Majewski changed the
! interface to SvFormContentDict and FormContentDict.  The multipart
! parsing was inspired by code submitted by Andreas Paepcke.  Guido van
! Rossum rewrote, reformatted and documented the module and is currently
! responsible for its maintenance.
! 
  
! XXX The module is getting pretty heavy with all those docstrings.
! Perhaps there should be a slimmed version that doesn't contain all those 
! backwards compatible and debugging classes and functions?
  
! """
  
  __version__ = "2.2"
--- 400,418 ----
  most systems, and is a security liability as well.
  
! """
  
! # XXX The module is getting pretty heavy with all those docstrings.
! # Perhaps there should be a slimmed version that doesn't contain all those 
! # backwards compatible and debugging classes and functions?
  
! # History
! # -------
! # 
! # Michael McLay started this module.  Steve Majewski changed the
! # interface to SvFormContentDict and FormContentDict.  The multipart
! # parsing was inspired by code submitted by Andreas Paepcke.  Guido van
! # Rossum rewrote, reformatted and documented the module and is currently
! # responsible for its maintenance.
! # 
  
  __version__ = "2.2"

Index: code.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/code.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** code.py	1998/10/22 21:56:44	1.8
--- code.py	2000/02/28 15:12:25	1.9
***************
*** 1,6 ****
  """Utilities needed to emulate Python's interactive interpreter.
  
- Inspired by similar code by Jeff Epler and Fredrik Lundh.
  """
  
  
--- 1,7 ----
  """Utilities needed to emulate Python's interactive interpreter.
  
  """
+ 
+ # Inspired by similar code by Jeff Epler and Fredrik Lundh.
  
  

Index: ftplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ftplib.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** ftplib.py	2000/02/04 15:39:29	1.40
--- ftplib.py	2000/02/28 15:12:25	1.41
***************
*** 4,12 ****
  (FTP), by J. Postel and J. Reynolds
  
- Changes and improvements suggested by Steve Majewski.
- Modified by Jack to work on the mac.
- Modified by Siebren to support docstrings and PASV.
- 
- 
  Example:
  
--- 4,7 ----
***************
*** 35,38 ****
--- 30,38 ----
  """
  
+ # 
+ # Changes and improvements suggested by Steve Majewski.
+ # Modified by Jack to work on the mac.
+ # Modified by Siebren to support docstrings and PASV.
+ #
  
  import os

Index: getpass.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/getpass.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** getpass.py	1999/10/18 22:25:22	1.8
--- getpass.py	2000/02/28 15:12:25	1.9
***************
*** 7,13 ****
  On the Mac EasyDialogs.AskPassword is used, if available.
  
- Authors: Piers Lauder (original)
-          Guido van Rossum (Windows support and cleanup)
  """
  
  import sys
--- 7,14 ----
  On the Mac EasyDialogs.AskPassword is used, if available.
  
  """
+ 
+ # Authors: Piers Lauder (original)
+ #          Guido van Rossum (Windows support and cleanup)
  
  import sys

Index: imaplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imaplib.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** imaplib.py	2000/02/24 02:24:50	1.16
--- imaplib.py	2000/02/28 15:12:25	1.17
***************
*** 4,11 ****
  Based on RFC 2060.
  
- Author: Piers Lauder <piers@cs.su.oz.au> December 1997.
- 
- Authentication code contributed by Donn Cave <donn@u.washington.edu> June 1998.
- 
  Public class:		IMAP4
  Public variable:	Debug
--- 4,7 ----
***************
*** 15,18 ****
--- 11,18 ----
  			Time2Internaldate
  """
+ 
+ # Author: Piers Lauder <piers@cs.su.oz.au> December 1997.
+ # 
+ # Authentication code contributed by Donn Cave <donn@u.washington.edu> June 1998.
  
  __version__ = "2.32"

Index: poplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/poplib.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** poplib.py	1999/05/13 18:47:25	1.6
--- poplib.py	2000/02/28 15:12:25	1.7
***************
*** 2,10 ****
  
  Based on the J. Myers POP3 draft, Jan. 96
- 
- Author: David Ascher <david_ascher@brown.edu>
-         [heavily stealing from nntplib.py]
- Updated: Piers Lauder <piers@cs.su.oz.au> [Jul '97]
  """
  
  # Example (see the test function at the end of this file)
--- 2,10 ----
  
  Based on the J. Myers POP3 draft, Jan. 96
  """
+ 
+ # Author: David Ascher <david_ascher@brown.edu>
+ #         [heavily stealing from nntplib.py]
+ # Updated: Piers Lauder <piers@cs.su.oz.au> [Jul '97]
  
  # Example (see the test function at the end of this file)

Index: smtplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/smtplib.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** smtplib.py	2000/02/04 15:39:30	1.21
--- smtplib.py	2000/02/28 15:12:25	1.22
***************
*** 3,14 ****
  """SMTP/ESMTP client class.
  
- Author: The Dragon De Monsyne <dragondm@integral.org>
- ESMTP support, test code and doc fixes added by
-     Eric S. Raymond <esr@thyrsus.com>
- Better RFC 821 compliance (MAIL and RCPT, and CRLF in data)
-     by Carey Evans <c.evans@clear.net.nz>, for picky mail servers.
-    
- This was modified from the Python 1.5 library HTTP lib.
- 
  This should follow RFC 821 (SMTP) and RFC 1869 (ESMTP).
  
--- 3,6 ----
***************
*** 39,42 ****
--- 31,42 ----
    >>> s.quit()
  """
+ 
+ # Author: The Dragon De Monsyne <dragondm@integral.org>
+ # ESMTP support, test code and doc fixes added by
+ #     Eric S. Raymond <esr@thyrsus.com>
+ # Better RFC 821 compliance (MAIL and RCPT, and CRLF in data)
+ #     by Carey Evans <c.evans@clear.net.nz>, for picky mail servers.
+ #    
+ # This was modified from the Python 1.5 library HTTP lib.
  
  import socket

Index: whrandom.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/whrandom.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** whrandom.py	2000/02/04 15:28:42	1.15
--- whrandom.py	2000/02/28 15:12:25	1.16
***************
*** 26,34 ****
  
  
- Translated by Guido van Rossum from C source provided by
- Adrian Baddeley.
  
- 
- 
  Multi-threading note: the random number generator used here is not
  thread-safe; it is possible that nearly simultaneous calls in
--- 26,30 ----
***************
*** 37,40 ****
--- 33,40 ----
  down in the serial case by using a lock here.)
  """
+ 
+ # Translated by Guido van Rossum from C source provided by
+ # Adrian Baddeley.
+ 
  
  class whrandom:



From akuchlin@CNRI.Reston.VA.US  Mon Feb 28 17:25:17 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Mon, 28 Feb 2000 12:25:17 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Demo/dns dnslib.py,1.2,1.3
Message-ID: <200002281725.MAA17902@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Demo/dns
In directory amarok:/home/akuchlin/src/Python-1.5/Demo/dns

Modified Files:
	dnslib.py 
Log Message:
Fix use of list.append() with multiple arguments


Index: dnslib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Demo/dns/dnslib.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** dnslib.py	1996/07/30 19:02:52	1.2
--- dnslib.py	2000/02/28 17:25:14	1.3
***************
*** 102,106 ****
  			n = len(label)
  			if offset + len(buf) < 0x3FFF:
! 				index.append(keys[j], offset + len(buf))
  			else:
  				print 'dnslib.Packer.addname:',
--- 102,106 ----
  			n = len(label)
  			if offset + len(buf) < 0x3FFF:
! 				index.append( (keys[j], offset + len(buf)) )
  			else:
  				print 'dnslib.Packer.addname:',



From guido@cnri.reston.va.us  Mon Feb 28 19:52:56 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 14:52:56 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src Makefile.in,1.82,1.83
Message-ID: <200002281952.OAA03570@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src
In directory eric:/projects/python/develop/guido/src

Modified Files:
	Makefile.in 
Log Message:
Drop the support level for stdwin a notch -- the contents of
lib-stdwin is no longer installed.

Increase the support level for other obsolete modules a bit: install
lib-old by default.  It still isn't in the path by default, but at
least it's easier to add to your $PYTHONPATH this way.  (This makes
sense because in 1.6 we're much more aggressive with declaring modules
obsolete.)


Index: Makefile.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Makefile.in,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -r1.82 -r1.83
*** Makefile.in	2000/02/10 17:23:44	1.82
--- Makefile.in	2000/02/28 19:52:53	1.83
***************
*** 290,294 ****
  PLATDIR=	plat-$(MACHDEP)
  MACHDEPS=	$(PLATDIR)
! LIBSUBDIRS=	lib-stdwin lib-tk test test/output $(MACHDEPS)
  libinstall:	python $(srcdir)/Lib/$(PLATDIR)
  		@for i in $(SCRIPTDIR) $(LIBDEST); \
--- 290,294 ----
  PLATDIR=	plat-$(MACHDEP)
  MACHDEPS=	$(PLATDIR)
! LIBSUBDIRS=	lib-old lib-tk test test/output $(MACHDEPS)
  libinstall:	python $(srcdir)/Lib/$(PLATDIR)
  		@for i in $(SCRIPTDIR) $(LIBDEST); \



From fdrake@weyr.cnri.reston.va.us  Mon Feb 28 20:39:15 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 28 Feb 2000 15:39:15 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/html index.html.in,1.4.4.1,1.4.4.2
Message-ID: <200002282039.PAA24087@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/html
In directory weyr:/home/fdrake/projects/python/Doc-152p1/html

Modified Files:
      Tag: release152p1-patches
	index.html.in 
Log Message:

Small formatting nit: center the table that displays the list of
titles, since the headers and such are centered.


Index: index.html.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/html/index.html.in,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -r1.4.4.1 -r1.4.4.2
*** index.html.in	2000/02/04 17:40:02	1.4.4.1
--- index.html.in	2000/02/28 20:39:12	1.4.4.2
***************
*** 39,43 ****
      </div>
  
!     <table>
        <tbody>
        <tr><td>
--- 39,43 ----
      </div>
  
!     <table align="center">
        <tbody>
        <tr><td>



From fdrake@weyr.cnri.reston.va.us  Mon Feb 28 20:49:17 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 28 Feb 2000 15:49:17 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libwhrandom.tex,1.10.4.1,1.10.4.2
Message-ID: <200002282049.PAA24187@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libwhrandom.tex 
Log Message:

Partial improvement in response to comments from Jan Kim
<kim@mpiz-koeln.mpg.de>.


Index: libwhrandom.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libwhrandom.tex,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -C2 -r1.10.4.1 -r1.10.4.2
*** libwhrandom.tex	2000/01/10 18:00:53	1.10.4.1
--- libwhrandom.tex	2000/02/28 20:49:14	1.10.4.2
***************
*** 12,20 ****
  following method, specific to the Wichmann-Hill algorithm:
  
! \begin{funcdesc}{seed}{x, y, z}
    Initializes the random number generator from the integers \var{x},
    \var{y} and \var{z}.  When the module is first imported, the random
    number is initialized using values derived from the current time.
! \end{funcdesc}
  
  
--- 12,26 ----
  following method, specific to the Wichmann-Hill algorithm:
  
! \begin{methoddesc}[whrandom]{seed}{\optional{x, y, z}}
    Initializes the random number generator from the integers \var{x},
    \var{y} and \var{z}.  When the module is first imported, the random
    number is initialized using values derived from the current time.
!   If \var{x}, \var{y}, and \var{z} are either omitted or \code{0}, the 
!   seed will be computed from the current system time.  If one or two
!   of the parameters are \code{0}, but not all three, the zero values
!   are replaced by ones.  This causes some appearantly different seeds
!   to be equal, with the corresponding result on the pseudo-random
!   series produced by the generator.
! \end{methoddesc}
  
  
***************
*** 23,26 ****
--- 29,33 ----
  available at the module level.  Therefore one can write either 
  \code{N = whrandom.random()} or:
+ 
  \begin{verbatim}
  generator = whrandom.whrandom()
***************
*** 28,31 ****
--- 35,40 ----
  \end{verbatim}
  
+ Note that using separate instances of the generator leads to
+ independent sequences of pseudo-random numbers.
  
  \begin{seealso}



From fdrake@weyr.cnri.reston.va.us  Mon Feb 28 20:52:22 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 28 Feb 2000 15:52:22 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/perl l2hinit.perl,1.38.4.3,1.38.4.4
Message-ID: <200002282052.PAA24223@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/perl
In directory weyr:/home/fdrake/projects/python/Doc-152p1/perl

Modified Files:
      Tag: release152p1-patches
	l2hinit.perl 
Log Message:

Slight cleanup of module index code.


Index: l2hinit.perl
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/perl/l2hinit.perl,v
retrieving revision 1.38.4.3
retrieving revision 1.38.4.4
diff -C2 -r1.38.4.3 -r1.38.4.4
*** l2hinit.perl	2000/02/21 17:49:26	1.38.4.3
--- l2hinit.perl	2000/02/28 20:52:19	1.38.4.4
***************
*** 295,302 ****
  		     . '</span>)</em>');
  	}
! 	print MODIDXFILE
! 	  $moditem
! 	    . $IDXFILE_FIELD_SEP
! 	    . "<tt class='module'>$key</tt>$plat###\n";
      }
      close(MODIDXFILE);
--- 295,299 ----
  		     . '</span>)</em>');
  	}
! 	print MODIDXFILE $moditem . $IDXFILE_FIELD_SEP . "$key$plat###\n";
      }
      close(MODIDXFILE);



From fdrake@weyr.cnri.reston.va.us  Mon Feb 28 20:59:06 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 28 Feb 2000 15:59:06 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib ConfigParser.py,1.14,1.15
Message-ID: <200002282059.PAA24383@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	ConfigParser.py 
Log Message:

(Finally!)  Changes related to the ConfigParser/INI-file topics
discussed on c.l.py last January.  Specifically:
  - more characters allowed in section & option names
  - if '=' is used to separate the option & value, the value can be
    followed by a comment of the form '\s;'


Index: ConfigParser.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ConfigParser.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** ConfigParser.py	1999/10/12 16:12:48	1.14
--- ConfigParser.py	2000/02/28 20:59:03	1.15
***************
*** 293,302 ****
      SECTCRE = re.compile(
          r'\['                                 # [
!         r'(?P<header>[-\w]+)'                 # `-', `_' or any alphanum
          r'\]'                                 # ]
          )
      OPTCRE = re.compile(
!         r'(?P<option>[-.\w]+)'                # - . _ alphanum
!         r'[ \t]*[:=][ \t]*'                   # any number of space/tab,
                                                # followed by separator
                                                # (either : or =), followed
--- 293,302 ----
      SECTCRE = re.compile(
          r'\['                                 # [
!         r'(?P<header>[-\w_.*,(){}]+)'         # `-', `_' or any alphanum
          r'\]'                                 # ]
          )
      OPTCRE = re.compile(
!         r'(?P<option>[-\w_.*,(){}]+)'         # - . _ alphanum
!         r'[ \t]*(?P<vi>[:=])[ \t]*'           # any number of space/tab,
                                                # followed by separator
                                                # (either : or =), followed
***************
*** 328,332 ****
                  continue
              if string.lower(string.split(line)[0]) == 'rem' \
!                and line[0] == "r":      # no leading whitespace
                  continue
              # continuation line?
--- 328,332 ----
                  continue
              if string.lower(string.split(line)[0]) == 'rem' \
!                and line[0] in "rR":      # no leading whitespace
                  continue
              # continuation line?
***************
*** 357,362 ****
                      mo = self.OPTCRE.match(line)
                      if mo:
!                         optname, optval = mo.group('option', 'value')
                          optname = string.lower(optname)
                          optval = string.strip(optval)
                          # allow empty values
--- 357,368 ----
                      mo = self.OPTCRE.match(line)
                      if mo:
!                         optname, vi, optval = mo.group('option', 'vi', 'value')
                          optname = string.lower(optname)
+                         if vi == '=' and ';' in optval:
+                             # ';' is a comment delimiter only if it follows
+                             # a spacing character
+                             pos = string.find(optval, ';')
+                             if pos and optval[pos-1] in string.whitespace:
+                                 optval = optval[:pos]
                          optval = string.strip(optval)
                          # allow empty values



From fdrake@weyr.cnri.reston.va.us  Mon Feb 28 21:04:56 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 28 Feb 2000 16:04:56 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc Makefile,1.190.2.3,1.190.2.4
Message-ID: <200002282104.QAA24433@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	Makefile 
Log Message:

Bump the release number.


Index: Makefile
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/Makefile,v
retrieving revision 1.190.2.3
retrieving revision 1.190.2.4
diff -C2 -r1.190.2.3 -r1.190.2.4
*** Makefile	2000/02/21 17:48:40	1.190.2.3
--- Makefile	2000/02/28 21:04:53	1.190.2.4
***************
*** 60,64 ****
  # This is the *documentation* release, and is used to construct the file
  # names of the downloadable tarballs.
! RELEASE=1.5.2p1
  
  
--- 60,64 ----
  # This is the *documentation* release, and is used to construct the file
  # names of the downloadable tarballs.
! RELEASE=1.5.2p2
  
  



From guido@cnri.reston.va.us  Mon Feb 28 22:37:33 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 17:37:33 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib imaplib.py,1.17,1.18
Message-ID: <200002282237.RAA03801@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	imaplib.py 
Log Message:
Patch by Piers Lauder, who writes:

This patch is re: Lucas.Dejonge@awtpl.com.au: [Python-bugs-list] imaplib -
not complying with RFC (PR#218)

Lucas de Jonge reported that the code in imaplib that detects a read-write
to read-only change doesn't comply with RFC 2060.


Index: imaplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imaplib.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** imaplib.py	2000/02/28 15:12:25	1.17
--- imaplib.py	2000/02/28 22:37:30	1.18
***************
*** 16,20 ****
  # Authentication code contributed by Donn Cave <donn@u.washington.edu> June 1998.
  
! __version__ = "2.32"
  
  import binascii, re, socket, string, time, random, sys
--- 16,20 ----
  # Authentication code contributed by Donn Cave <donn@u.washington.edu> June 1998.
  
! __version__ = "2.33"
  
  import binascii, re, socket, string, time, random, sys
***************
*** 129,132 ****
--- 129,133 ----
  		self.untagged_responses = {}	# {typ: [data, ...], ...}
  		self.continuation_response = ''	# Last continuation response
+ 		self.is_readonly = None		# READ-ONLY desired state
  		self.tagnum = 0
  
***************
*** 471,474 ****
--- 472,476 ----
  		# Mandated responses are ('FLAGS', 'EXISTS', 'RECENT', 'UIDVALIDITY')
  		self.untagged_responses = {}	# Flush old responses.
+ 		self.is_readonly = readonly
  		if readonly:
  			name = 'EXAMINE'
***************
*** 480,484 ****
  			return typ, dat
  		self.state = 'SELECTED'
! 		if not self.untagged_responses.has_key('READ-WRITE') \
  			and not readonly:
  			if __debug__:
--- 482,486 ----
  			return typ, dat
  		self.state = 'SELECTED'
! 		if self.untagged_responses.has_key('READ-ONLY') \
  			and not readonly:
  			if __debug__:
***************
*** 595,601 ****
  				del self.untagged_responses[typ]
  
! 		if self.untagged_responses.has_key('READ-WRITE') \
! 		and self.untagged_responses.has_key('READ-ONLY'):
! 			del self.untagged_responses['READ-WRITE']
  			raise self.readonly('mailbox status changed to READ-ONLY')
  
--- 597,602 ----
  				del self.untagged_responses[typ]
  
! 		if self.untagged_responses.has_key('READ-ONLY') \
! 		and not self.is_readonly:
  			raise self.readonly('mailbox status changed to READ-ONLY')
  



From fdrake@weyr.cnri.reston.va.us  Mon Feb 28 23:23:59 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 28 Feb 2000 18:23:59 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib ConfigParser.py,1.15,1.16
Message-ID: <200002282323.SAA27382@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	ConfigParser.py 
Log Message:

Fix comments relating to the specific regexs used to parse section and 
option names; errors noted by Greg Stein <gstein@lyra.org>.


Index: ConfigParser.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ConfigParser.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** ConfigParser.py	2000/02/28 20:59:03	1.15
--- ConfigParser.py	2000/02/28 23:23:55	1.16
***************
*** 293,301 ****
      SECTCRE = re.compile(
          r'\['                                 # [
!         r'(?P<header>[-\w_.*,(){}]+)'         # `-', `_' or any alphanum
          r'\]'                                 # ]
          )
      OPTCRE = re.compile(
!         r'(?P<option>[-\w_.*,(){}]+)'         # - . _ alphanum
          r'[ \t]*(?P<vi>[:=])[ \t]*'           # any number of space/tab,
                                                # followed by separator
--- 293,301 ----
      SECTCRE = re.compile(
          r'\['                                 # [
!         r'(?P<header>[-\w_.*,(){}]+)'         # a lot of stuff found by IvL
          r'\]'                                 # ]
          )
      OPTCRE = re.compile(
!         r'(?P<option>[-\w_.*,(){}]+)'         # a lot of stuff found by IvL
          r'[ \t]*(?P<vi>[:=])[ \t]*'           # any number of space/tab,
                                                # followed by separator



From akuchlin@CNRI.Reston.VA.US  Tue Feb 29 00:10:27 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Mon, 28 Feb 2000 19:10:27 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib threading.py,1.6,1.7
Message-ID: <200002290010.TAA18675@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory amarok:/home/akuchlin/src/Python-1.5/Lib

Modified Files:
	threading.py 
Log Message:
Fix a typo in a comment


Index: threading.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/threading.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** threading.py	2000/02/04 15:28:41	1.6
--- threading.py	2000/02/29 00:10:24	1.7
***************
*** 238,242 ****
  class _Semaphore(_Verbose):
  
!     # After Tim Peters' semaphore class, but bnot quite the same (no maximum)
  
      def __init__(self, value=1, verbose=None):
--- 238,242 ----
  class _Semaphore(_Verbose):
  
!     # After Tim Peters' semaphore class, but not quite the same (no maximum)
  
      def __init__(self, value=1, verbose=None):



From fdrake@weyr.cnri.reston.va.us  Tue Feb 29 05:19:41 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 29 Feb 2000 00:19:41 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libos.tex,1.36,1.37
Message-ID: <200002290519.AAA27789@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc/lib

Modified Files:
	libos.tex 
Log Message:

Update portability information for the spawn*() functions and related
constants.  Someone will need to fill in information on the spawn*()
functions that aren't listed.


Index: libos.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libos.tex,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** libos.tex	1999/12/15 19:39:04	1.36
--- libos.tex	2000/02/29 05:19:38	1.37
***************
*** 789,793 ****
  information; the constants are exposed to the Python programmer as
  listed below.
! Availability: Windows.
  \versionadded{1.5.2}
  \end{funcdesc}
--- 789,793 ----
  information; the constants are exposed to the Python programmer as
  listed below.
! Availability: \UNIX{}, Windows.
  \versionadded{1.5.2}
  \end{funcdesc}
***************
*** 800,804 ****
  \Cpp{} Runtime Library documentation for further information; the
  constants are exposed to the Python programmer as listed below.
! Availability: Windows.
  \versionadded{1.5.2}
  \end{funcdesc}
--- 800,804 ----
  \Cpp{} Runtime Library documentation for further information; the
  constants are exposed to the Python programmer as listed below.
! Availability: \UNIX{}, Windows.
  \versionadded{1.5.2}
  \end{funcdesc}
***************
*** 807,814 ****
  \dataline{P_NOWAIT}
  \dataline{P_NOWAITO}
- \dataline{P_OVERLAY}
- \dataline{P_DETACH}
  Possible values for the \var{mode} parameter to \function{spawnv()}
  and \function{spawnve()}.
  Availability: Windows.
  \versionadded{1.5.2}
--- 807,821 ----
  \dataline{P_NOWAIT}
  \dataline{P_NOWAITO}
  Possible values for the \var{mode} parameter to \function{spawnv()}
  and \function{spawnve()}.
+ Availability: \UNIX{}, Windows.
+ \versionadded{1.5.2}
+ \end{datadesc}
+ 
+ \begin{datadesc}{P_OVERLAY}
+ \dataline{P_DETACH}
+ Possible values for the \var{mode} parameter to \function{spawnv()}
+ and \function{spawnve()}.  These are less portable than those listed
+ above.
  Availability: Windows.
  \versionadded{1.5.2}



Return-Path: <artcom0!pf@artcom-gmbh.de>
Delivered-To: python-checkins@python.org
Received: from mail.provi.de (mail.hamburg.pop.de [193.98.9.7])
	by dinsdale.python.org (Postfix) with ESMTP id 2F6041CD45
	for <python-checkins@python.org>; Tue, 29 Feb 2000 02:51:55 -0500 (EST)
Received: from mars.hamburg.pop.de ([195.222.210.104] helo=mail.bremen.pop.de)
	by mail.provi.de with esmtp (Exim 3.13 #1)
	id 12PhTJ-0006s0-00; Tue, 29 Feb 2000 08:53:33 +0100
Received: from uucp by mail.bremen.pop.de with local-rmail (Exim 2.02 #2)
	id 12PhWt-0005kA-00; Tue, 29 Feb 2000 08:57:15 +0100
Received: from artcom7.UUCP (uartcom@localhost)
	by artinet.artcom-gmbh.de (8.8.8+Sun/8.8.8) with UUCP id IAA03983;
	Tue, 29 Feb 2000 08:52:07 +0100 (MET)
Received: from artcom0 by artcom7.artcom-gmbh.de  with uucp
	(Smail3.2 #1) id m12PhQy-000pAXC; Tue, 29 Feb 2000 08:51:08 +0100 (MET)
Received: by artcom0.artcom-gmbh.de (Smail3.2 #1)
	id m12Ph1W-000CnCC; Tue, 29 Feb 2000 08:24:50 +0100 (MET)
Message-Id: <m12Ph1W-000CnCC@artcom0.artcom-gmbh.de>
From: pf@artcom-gmbh.de (Peter Funk)
Subject: Re: [Python-checkins] CVS: python/dist/src Makefile.in,1.82,1.83
In-Reply-To: <200002281952.OAA03570@eric.cnri.reston.va.us> from Guido van Rossum at "Feb 28, 2000  2:52:56 pm"
To: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:24:50 +0100 (MET)
Cc: python-checkins@python.org
Organization: privat (Mitglied im IN e.V.)
Phone: +49 4222 950270
X-Fax: +49 4222 950260
X-Commercial-ReplyTo: pf@artcom-gmbh.de (Peter Funk)
X-Mailer: ELM [version 2.4ME+ PL47 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: python-checkins-admin@python.org
Errors-To: python-checkins-admin@python.org
X-BeenThere: python-checkins@python.org
X-Mailman-Version: 1.2 (beta 1)
Precedence: bulk
List-Id: Check-in messages from the Python maintainers <python-checkins.python.org>

Guido van Rossum wrote:
> Increase the support level for other obsolete modules a bit: install
> lib-old by default.  It still isn't in the path by default, but at
> least it's easier to add to your $PYTHONPATH this way.  (This makes
> sense because in 1.6 we're much more aggressive with declaring modules
----------------------------------^^^^^^^^^^^^^^^
> obsolete.)

Indeed!  IMHO it would make much sense if you (Guido) post a list of 
this modules (that have been moved to lib-old) as an official annoucement 
several weeks *BEFORE*  Python 1.6 will come out.

Eventually something like this (sorry english is not my native language):  

"""With the upcoming release of Python 1.6 the following modules,
   which were part of the standard library until and including
   Python 1.5.2, have been declared obsolete and have been moved
   into the sub directory lib-old, which is *NOT* on your PYTHONPATH
   by default.  Please check your existing Python applications and 
   update them, if ever possible in preparation for Python 1.6:
   
   ... list of modules..."""

Regards, Peter
-- 
Peter Funk, Oldenburger Str.86, D-27777 Ganderkesee, Germany, Fax:+49 4222950260
office: +49 421 20419-0 (ArtCom GmbH, Grazer Str.8, D-28359 Bremen)


From guido@cnri.reston.va.us  Tue Feb 29 13:00:19 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:00:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts mailerdaemon.py,1.7,1.8
Message-ID: <200002291300.IAA04572@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Modified Files:
	mailerdaemon.py 
Log Message:
Fix multi-arg append().


Index: mailerdaemon.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/scripts/mailerdaemon.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** mailerdaemon.py	1998/10/09 13:27:49	1.7
--- mailerdaemon.py	2000/02/29 13:00:16	1.8
***************
*** 219,223 ****
      list = []
      for e in errordict.keys():
!         list.append(errordict[e], errorfirst[e], errorlast[e], e)
      list.sort()
      for num, first, last, e in list:
--- 219,223 ----
      list = []
      for e in errordict.keys():
!         list.append((errordict[e], errorfirst[e], errorlast[e], e))
      list.sort()
      for num, first, last, e in list:



From guido@cnri.reston.va.us  Tue Feb 29 13:05:51 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:05:51 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts checkappend.py,NONE,1.1
Message-ID: <200002291305.IAA04614@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Added Files:
	checkappend.py 
Log Message:
Script by Tim Peters to discover illegal append() calls.





From guido@cnri.reston.va.us  Tue Feb 29 13:08:47 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:08:47 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts checkappend.py,1.1,1.2
Message-ID: <200002291308.IAA04647@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Modified Files:
	checkappend.py 
Log Message:
Correct type error in getopt.error handling code.


Index: checkappend.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/scripts/checkappend.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** checkappend.py	2000/02/29 13:05:49	1.1
--- checkappend.py	2000/02/29 13:08:44	1.2
***************
*** 53,57 ****
          opts, args = getopt.getopt(sys.argv[1:], "v")
      except getopt.error, msg:
!         errprint(msg + "\n\n" + __doc__)
          return
      for opt, optarg in opts:
--- 53,57 ----
          opts, args = getopt.getopt(sys.argv[1:], "v")
      except getopt.error, msg:
!         errprint(str(msg) + "\n\n" + __doc__)
          return
      for opt, optarg in opts:



From guido@cnri.reston.va.us  Tue Feb 29 13:31:19 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:31:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib posixpath.py,1.29,1.30
Message-ID: <200002291331.IAA04743@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	posixpath.py 
Log Message:
Remove some redundant logic from walk() -- there's no need to check
for "." and "..", since listdir() no longer returns those.


Index: posixpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/posixpath.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** posixpath.py	2000/02/28 14:27:07	1.29
--- posixpath.py	2000/02/29 13:31:16	1.30
***************
*** 264,270 ****
          return
      func(arg, top, names)
-     exceptions = ('.', '..')
      for name in names:
-         if name not in exceptions:
              name = join(top, name)
              st = os.lstat(name)
--- 264,268 ----



From guido@python.org  Tue Feb 29 13:38:01 2000
From: guido@python.org (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:38:01 -0500
Subject: [Python-checkins] CVS: python/dist/src Makefile.in,1.82,1.83
In-Reply-To: Your message of "Tue, 29 Feb 2000 08:24:50 +0100."
 <m12Ph1W-000CnCC@artcom0.artcom-gmbh.de>
References: <m12Ph1W-000CnCC@artcom0.artcom-gmbh.de>
Message-ID: <200002291338.IAA04782@eric.cnri.reston.va.us>

> Indeed!  IMHO it would make much sense if you (Guido) post a list of 
> this modules (that have been moved to lib-old) as an official annoucement 
> several weeks *BEFORE*  Python 1.6 will come out.

You can already extract this from the updated documetation on the
website (which has a list of obsolete modules).

But you're righ,t it would be good to be open about this.  I'll think
about it.

--Guido van Rossum (home page: http://www.python.org/~guido/)


Return-Path: <fredrik@pythonware.com>
Delivered-To: python-checkins@python.org
Received: from pythonware.com (python-010.pythonware.com [194.18.155.250])
	by dinsdale.python.org (Postfix) with ESMTP id 7D0F81CD1E
	for <python-checkins@python.org>; Tue, 29 Feb 2000 07:47:17 -0500 (EST)
Received: from panik (panik.secret.pythonware.com [194.18.155.242])
	by pythonware.com (8.8.7/8.8.5) with SMTP id OAA00501
	for <python-checkins@python.org>; Tue, 29 Feb 2000 14:59:37 +0100
Message-ID: <00e601bf82b3$62570450$f29b12c2@secret.pythonware.com>
From: "Fredrik Lundh" <fredrik@pythonware.com>
To: <python-checkins@python.org>
References: <m12Ph1W-000CnCC@artcom0.artcom-gmbh.de>
Subject: Re: [Python-checkins] CVS: python/dist/src Makefile.in,1.82,1.83
Date: Tue, 29 Feb 2000 13:49:13 +0100
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 5.00.2919.6600
X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2919.6600
Sender: python-checkins-admin@python.org
Errors-To: python-checkins-admin@python.org
X-BeenThere: python-checkins@python.org
X-Mailman-Version: 1.2 (beta 1)
Precedence: bulk
List-Id: Check-in messages from the Python maintainers <python-checkins.python.org>

Peter Funk wrote:
> > Increase the support level for other obsolete modules a bit: install
> > lib-old by default.  It still isn't in the path by default, but at
> > least it's easier to add to your $PYTHONPATH this way.  (This makes
> > sense because in 1.6 we're much more aggressive with declaring =
modules
> ----------------------------------^^^^^^^^^^^^^^^
> > obsolete.)
>=20
> Indeed!  IMHO it would make much sense if you (Guido) post a list of=20
> this modules (that have been moved to lib-old) as an official =
annoucement=20
> several weeks *BEFORE*  Python 1.6 will come out.

obsoletemodulenanny.py, anyone?

(hey, it worked yesterday ;-)

</F>



From guido@cnri.reston.va.us  Tue Feb 29 13:59:31 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:59:31 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects complexobject.c,2.22,2.23 fileobject.c,2.69,2.70 stringobject.c,2.54,2.55
Message-ID: <200002291359.IAA05296@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	complexobject.c fileobject.c stringobject.c 
Log Message:
Massive patch by Skip Montanaro to add ":name" to as many
PyArg_ParseTuple() format string arguments as possible.


Index: complexobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/complexobject.c,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -r2.22 -r2.23
*** complexobject.c	2000/01/20 22:32:54	2.22
--- complexobject.c	2000/02/29 13:59:28	2.23
***************
*** 579,583 ****
  {
  	Py_complex c;
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	c = ((PyComplexObject *)self)->cval;
--- 579,583 ----
  {
  	Py_complex c;
! 	if (!PyArg_ParseTuple(args, ":conjugate"))
  		return NULL;
  	c = ((PyComplexObject *)self)->cval;

Index: fileobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/fileobject.c,v
retrieving revision 2.69
retrieving revision 2.70
diff -C2 -r2.69 -r2.70
*** fileobject.c	1999/08/27 20:38:57	2.69
--- fileobject.c	2000/02/29 13:59:28	2.70
***************
*** 264,268 ****
  		return err_closed();
  	whence = 0;
! 	if (!PyArg_ParseTuple(args, "O|i", &offobj, &whence))
  		return NULL;
  #if !defined(HAVE_LARGEFILE_SUPPORT)
--- 264,268 ----
  		return err_closed();
  	whence = 0;
! 	if (!PyArg_ParseTuple(args, "O|i:seek", &offobj, &whence))
  		return NULL;
  #if !defined(HAVE_LARGEFILE_SUPPORT)
***************
*** 306,310 ****
  		return err_closed();
  	newsizeobj = NULL;
! 	if (!PyArg_ParseTuple(args, "|O", &newsizeobj))
  		return NULL;
  	if (newsizeobj != NULL) {
--- 306,310 ----
  		return err_closed();
  	newsizeobj = NULL;
! 	if (!PyArg_ParseTuple(args, "|O:truncate", &newsizeobj))
  		return NULL;
  	if (newsizeobj != NULL) {
***************
*** 519,523 ****
  	if (f->f_fp == NULL)
  		return err_closed();
! 	if (!PyArg_ParseTuple(args, "|l", &bytesrequested))
  		return NULL;
  	if (bytesrequested < 0)
--- 519,523 ----
  	if (f->f_fp == NULL)
  		return err_closed();
! 	if (!PyArg_ParseTuple(args, "|l:read", &bytesrequested))
  		return NULL;
  	if (bytesrequested < 0)
***************
*** 733,737 ****
  	if (f->f_fp == NULL)
  		return err_closed();
! 	if (!PyArg_ParseTuple(args, "|i", &n))
  		return NULL;
  	if (n == 0)
--- 733,737 ----
  	if (f->f_fp == NULL)
  		return err_closed();
! 	if (!PyArg_ParseTuple(args, "|i:readline", &n))
  		return NULL;
  	if (n == 0)
***************
*** 762,766 ****
  	if (f->f_fp == NULL)
  		return err_closed();
! 	if (!PyArg_ParseTuple(args, "|l", &sizehint))
  		return NULL;
  	if ((list = PyList_New(0)) == NULL)
--- 762,766 ----
  	if (f->f_fp == NULL)
  		return err_closed();
! 	if (!PyArg_ParseTuple(args, "|l:readlines", &sizehint))
  		return NULL;
  	if ((list = PyList_New(0)) == NULL)

Index: stringobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.54
retrieving revision 2.55
diff -C2 -r2.54 -r2.55
*** stringobject.c	2000/01/20 22:32:54	2.54
--- stringobject.c	2000/02/29 13:59:28	2.55
***************
*** 613,617 ****
  	splitcount = 0;
  	maxsplit = 0;
! 	if (!PyArg_ParseTuple(args, "|z#i", &sub, &n, &maxsplit))
  		return NULL;
  	if (sub == NULL)
--- 613,617 ----
  	splitcount = 0;
  	maxsplit = 0;
! 	if (!PyArg_ParseTuple(args, "|z#i:split", &sub, &n, &maxsplit))
  		return NULL;
  	if (sub == NULL)
***************
*** 681,685 ****
  	PyObject *seq;
  
! 	if (!PyArg_ParseTuple(args, "O", &seq))
  		return NULL;
  
--- 681,685 ----
  	PyObject *seq;
  
! 	if (!PyArg_ParseTuple(args, "O:join", &seq))
  		return NULL;
  
***************
*** 770,774 ****
  	int n, i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii", &sub, &n, &i, &last))
  		return -2;
  
--- 770,774 ----
  	int n, i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii:find", &sub, &n, &i, &last))
  		return -2;
  
***************
*** 849,853 ****
  	int i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii", &sub, &n, &i, &last))
  		return -2;
  
--- 849,853 ----
  	int i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii:rfind", &sub, &n, &i, &last))
  		return -2;
  
***************
*** 927,931 ****
  	int len = PyString_GET_SIZE(self), i, j;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 927,931 ----
  	int len = PyString_GET_SIZE(self), i, j;
  
! 	if (!PyArg_ParseTuple(args, ":strip"))
  		return NULL;
  
***************
*** 1011,1015 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
--- 1011,1015 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ":lower"))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
***************
*** 1043,1047 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
--- 1043,1047 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ":upper"))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
***************
*** 1076,1080 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
--- 1076,1080 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ":capitalize"))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
***************
*** 1119,1123 ****
  	int m, r;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii", &sub, &n, &i, &last))
  		return NULL;
  	if (last > len)
--- 1119,1123 ----
  	int m, r;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii:count", &sub, &n, &i, &last))
  		return NULL;
  	if (last > len)
***************
*** 1163,1167 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
--- 1163,1167 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ":swapcase"))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
***************
*** 1206,1210 ****
  	int trans_table[256];
  
! 	if (!PyArg_ParseTuple(args, "t#|t#",
  			      &table1, &tablen, &del_table, &dellen))
  		return NULL;
--- 1206,1210 ----
  	int trans_table[256];
  
! 	if (!PyArg_ParseTuple(args, "t#|t#:translate",
  			      &table1, &tablen, &del_table, &dellen))
  		return NULL;
***************
*** 1423,1427 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|i",
  			      &pat, &pat_len, &sub, &sub_len, &count))
  		return NULL;
--- 1423,1427 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|i:replace",
  			      &pat, &pat_len, &sub, &sub_len, &count))
  		return NULL;
***************
*** 1467,1471 ****
  	int end = -1;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii", &prefix, &plen, &start, &end))
  		return NULL;
  
--- 1467,1471 ----
  	int end = -1;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii:startswith", &prefix, &plen, &start, &end))
  		return NULL;
  
***************
*** 1510,1514 ****
  	int lower, upper;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii", &suffix, &plen, &start, &end))
  		return NULL;
  
--- 1510,1514 ----
  	int lower, upper;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii:endswith", &suffix, &plen, &start, &end))
  		return NULL;
  



From guido@cnri.reston.va.us  Tue Feb 29 13:59:32 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:59:32 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python bltinmodule.c,2.148,2.149 import.c,2.128,2.129 sysmodule.c,2.57,2.58
Message-ID: <200002291359.IAA05307@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory eric:/projects/python/develop/guido/src/Python

Modified Files:
	bltinmodule.c import.c sysmodule.c 
Log Message:
Massive patch by Skip Montanaro to add ":name" to as many
PyArg_ParseTuple() format string arguments as possible.


Index: bltinmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.148
retrieving revision 2.149
diff -C2 -r2.148 -r2.149
*** bltinmodule.c	2000/02/17 15:18:10	2.148
--- bltinmodule.c	2000/02/29 13:59:29	2.149
***************
*** 847,851 ****
  	PyObject *d;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	d = PyEval_GetGlobals();
--- 847,851 ----
  	PyObject *d;
  
! 	if (!PyArg_ParseTuple(args, ":globals"))
  		return NULL;
  	d = PyEval_GetGlobals();
***************
*** 1213,1217 ****
  {
  	PyObject *s;
! 	if (!PyArg_ParseTuple(args, "S", &s))
  		return NULL;
  	Py_INCREF(s);
--- 1213,1217 ----
  {
  	PyObject *s;
! 	if (!PyArg_ParseTuple(args, "S:intern", &s))
  		return NULL;
  	Py_INCREF(s);
***************
*** 1384,1388 ****
  	PyObject *d;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	d = PyEval_GetLocals();
--- 1384,1388 ----
  	PyObject *d;
  
! 	if (!PyArg_ParseTuple(args, ":locals"))
  		return NULL;
  	d = PyEval_GetLocals();
***************
*** 2092,2096 ****
  	int retval = 0;
  
! 	if (!PyArg_ParseTuple(args, "OO", &inst, &cls))
  		return NULL;
  
--- 2092,2096 ----
  	int retval = 0;
  
! 	if (!PyArg_ParseTuple(args, "OO:isinstance", &inst, &cls))
  		return NULL;
  
***************
*** 2151,2155 ****
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "OO", &derived, &cls))
  		return NULL;
  
--- 2151,2155 ----
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "OO:issubclass", &derived, &cls))
  		return NULL;
  

Index: import.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/import.c,v
retrieving revision 2.128
retrieving revision 2.129
diff -C2 -r2.128 -r2.129
*** import.c	1999/12/22 14:09:35	2.128
--- import.c	2000/02/29 13:59:29	2.129
***************
*** 1952,1956 ****
  	char buf[4];
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	buf[0] = (char) ((MAGIC >>  0) & 0xff);
--- 1952,1956 ----
  	char buf[4];
  
! 	if (!PyArg_ParseTuple(args, ":get_magic"))
  		return NULL;
  	buf[0] = (char) ((MAGIC >>  0) & 0xff);
***************
*** 1970,1974 ****
  	struct filedescr *fdp;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	list = PyList_New(0);
--- 1970,1974 ----
  	struct filedescr *fdp;
  
! 	if (!PyArg_ParseTuple(args, ":get_suffixes"))
  		return NULL;
  	list = PyList_New(0);
***************
*** 2033,2037 ****
  	char *name;
  	PyObject *path = NULL;
! 	if (!PyArg_ParseTuple(args, "s|O", &name, &path))
  		return NULL;
  	return call_find_module(name, path);
--- 2033,2037 ----
  	char *name;
  	PyObject *path = NULL;
! 	if (!PyArg_ParseTuple(args, "s|O:find_module", &name, &path))
  		return NULL;
  	return call_find_module(name, path);
***************
*** 2046,2050 ****
  	int ret;
  	PyObject *m;
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	ret = init_builtin(name);
--- 2046,2050 ----
  	int ret;
  	PyObject *m;
! 	if (!PyArg_ParseTuple(args, "s:init_builtin", &name))
  		return NULL;
  	ret = init_builtin(name);
***************
*** 2068,2072 ****
  	int ret;
  	PyObject *m;
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	ret = PyImport_ImportFrozenModule(name);
--- 2068,2072 ----
  	int ret;
  	PyObject *m;
! 	if (!PyArg_ParseTuple(args, "s:init_frozen", &name))
  		return NULL;
  	ret = PyImport_ImportFrozenModule(name);
***************
*** 2089,2093 ****
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	return get_frozen_object(name);
--- 2089,2093 ----
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "s:get_frozen_object", &name))
  		return NULL;
  	return get_frozen_object(name);
***************
*** 2100,2104 ****
  {
  	char *name;
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	return PyInt_FromLong(is_builtin(name));
--- 2100,2104 ----
  {
  	char *name;
! 	if (!PyArg_ParseTuple(args, "s:is_builtin", &name))
  		return NULL;
  	return PyInt_FromLong(is_builtin(name));
***************
*** 2112,2116 ****
  	char *name;
  	struct _frozen *p;
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	p = find_frozen(name);
--- 2112,2116 ----
  	char *name;
  	struct _frozen *p;
! 	if (!PyArg_ParseTuple(args, "s:is_frozen", &name))
  		return NULL;
  	p = find_frozen(name);
***************
*** 2149,2153 ****
  	PyObject *m;
  	FILE *fp;
! 	if (!PyArg_ParseTuple(args, "ss|O!", &name, &pathname,
  			      &PyFile_Type, &fob))
  		return NULL;
--- 2149,2153 ----
  	PyObject *m;
  	FILE *fp;
! 	if (!PyArg_ParseTuple(args, "ss|O!:load_compiled", &name, &pathname,
  			      &PyFile_Type, &fob))
  		return NULL;
***************
*** 2173,2177 ****
  	PyObject *m;
  	FILE *fp = NULL;
! 	if (!PyArg_ParseTuple(args, "ss|O!", &name, &pathname,
  			      &PyFile_Type, &fob))
  		return NULL;
--- 2173,2177 ----
  	PyObject *m;
  	FILE *fp = NULL;
! 	if (!PyArg_ParseTuple(args, "ss|O!:load_dynamic", &name, &pathname,
  			      &PyFile_Type, &fob))
  		return NULL;
***************
*** 2197,2201 ****
  	PyObject *m;
  	FILE *fp;
! 	if (!PyArg_ParseTuple(args, "ss|O!", &name, &pathname,
  			      &PyFile_Type, &fob))
  		return NULL;
--- 2197,2201 ----
  	PyObject *m;
  	FILE *fp;
! 	if (!PyArg_ParseTuple(args, "ss|O!:load_source", &name, &pathname,
  			      &PyFile_Type, &fob))
  		return NULL;
***************
*** 2219,2223 ****
  	PyObject *m;
  
! 	if (!PyArg_ParseTuple(args, "ss", &name, &pathname))
  		return NULL;
  	m = PyMac_LoadResourceModule(name, pathname);
--- 2219,2223 ----
  	PyObject *m;
  
! 	if (!PyArg_ParseTuple(args, "ss:load_resource", &name, &pathname))
  		return NULL;
  	m = PyMac_LoadResourceModule(name, pathname);
***************
*** 2239,2243 ****
  	FILE *fp;
  
! 	if (!PyArg_ParseTuple(args, "sOs(ssi)",
  			      &name, &fob, &pathname,
  			      &suffix, &mode, &type))
--- 2239,2243 ----
  	FILE *fp;
  
! 	if (!PyArg_ParseTuple(args, "sOs(ssi):load_module",
  			      &name, &fob, &pathname,
  			      &suffix, &mode, &type))
***************
*** 2270,2274 ****
  	char *name;
  	char *pathname;
! 	if (!PyArg_ParseTuple(args, "ss", &name, &pathname))
  		return NULL;
  	return load_package(name, pathname);
--- 2270,2274 ----
  	char *name;
  	char *pathname;
! 	if (!PyArg_ParseTuple(args, "ss:load_package", &name, &pathname))
  		return NULL;
  	return load_package(name, pathname);
***************
*** 2281,2285 ****
  {
  	char *name;
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	return PyModule_New(name);
--- 2281,2285 ----
  {
  	char *name;
! 	if (!PyArg_ParseTuple(args, "s:new_module", &name))
  		return NULL;
  	return PyModule_New(name);

Index: sysmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/sysmodule.c,v
retrieving revision 2.57
retrieving revision 2.58
diff -C2 -r2.57 -r2.58
*** sysmodule.c	1999/10/05 22:17:41	2.57
--- sysmodule.c	2000/02/29 13:59:29	2.58
***************
*** 193,197 ****
  {
  	PyThreadState *tstate = PyThreadState_Get();
! 	if (!PyArg_ParseTuple(args, "i", &tstate->interp->checkinterval))
  		return NULL;
  	Py_INCREF(Py_None);
--- 193,197 ----
  {
  	PyThreadState *tstate = PyThreadState_Get();
! 	if (!PyArg_ParseTuple(args, "i:setcheckinterval", &tstate->interp->checkinterval))
  		return NULL;
  	Py_INCREF(Py_None);



From guido@cnri.reston.va.us  Tue Feb 29 14:00:00 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 09:00:00 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules _localemodule.c,2.6,2.7 _tkinter.c,1.89,1.90 almodule.c,1.22,1.23 audioop.c,1.34,1.35 binascii.c,2.18,2.19 bsddbmodule.c,1.16,1.17 cPickle.c,2.37,2.38 cStringIO.c,2.17,2.18 cdmodule.c,1.17,1.18 dbmmodule.c,2.15,2.16 fcntlmodule.c,2.18,2.19 gdbmmodule.c,2.20,2.21 md5module.c,2.13,2.14 newmodule.c,2.18,2.19 pcremodule.c,2.16,2.17 puremodule.c,2.1,2.2 readline.c,2.15,2.16 regexmodule.c,1.32,1.33 resource.c,2.9,2.10 rotormodule.c,2.21,2.22 selectmodule.c,2.30,2.31 shamodule.c,2.3,2.4 socketmodule.c,1.95,1.96 soundex.c,2.6,2.7 stropmodule.c,2.60,2.61 structmodule.c,2.29,2.30 syslogmodule.c,2.12,2.13 threadmodule.c,2.29,2.30 timemodule.c,2.78,2.79 xxmodule.c,2.14,2.15 zlibmodule.c,2.29,2.30
Message-ID: <200002291400.JAA05381@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/src/Modules

Modified Files:
	_localemodule.c _tkinter.c almodule.c audioop.c binascii.c 
	bsddbmodule.c cPickle.c cStringIO.c cdmodule.c dbmmodule.c 
	fcntlmodule.c gdbmmodule.c md5module.c newmodule.c 
	pcremodule.c puremodule.c readline.c regexmodule.c resource.c 
	rotormodule.c selectmodule.c shamodule.c socketmodule.c 
	soundex.c stropmodule.c structmodule.c syslogmodule.c 
	threadmodule.c timemodule.c xxmodule.c zlibmodule.c 
Log Message:
Massive patch by Skip Montanaro to add ":name" to as many
PyArg_ParseTuple() format string arguments as possible.


Index: _localemodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/_localemodule.c,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -r2.6 -r2.7
*** _localemodule.c	1998/12/04 18:49:34	2.6
--- _localemodule.c	2000/02/29 13:59:22	2.7
***************
*** 136,140 ****
    PyObject *result_object;
    struct lconv *lc;
!   if(!PyArg_ParseTuple(args,"i|z",&category,&locale))return 0;
    if(locale){
      /* set locale */
--- 136,140 ----
    PyObject *result_object;
    struct lconv *lc;
!   if(!PyArg_ParseTuple(args,"i|z:setlocale",&category,&locale))return 0;
    if(locale){
      /* set locale */
***************
*** 267,271 ****
  {
    char *s1,*s2;
!   if(!PyArg_ParseTuple(args,"ss",&s1,&s2))
       return NULL;
    return PyInt_FromLong(strcoll(s1,s2));
--- 267,271 ----
  {
    char *s1,*s2;
!   if(!PyArg_ParseTuple(args,"ss:strcoll",&s1,&s2))
       return NULL;
    return PyInt_FromLong(strcoll(s1,s2));
***************
*** 284,288 ****
    int n1,n2;
    PyObject *result;
!   if(!PyArg_ParseTuple(args,"s",&s))
       return NULL;
    /* assume no change in size, first */
--- 284,288 ----
    int n1,n2;
    PyObject *result;
!   if(!PyArg_ParseTuple(args,"s:strxfrm",&s))
       return NULL;
    /* assume no change in size, first */

Index: _tkinter.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -r1.89 -r1.90
*** _tkinter.c	1999/11/05 18:09:56	1.89
--- _tkinter.c	2000/02/29 13:59:22	1.90
***************
*** 698,702 ****
  	int err;
    
! 	if (!PyArg_ParseTuple(args, "s", &script))
  		return NULL;
  
--- 698,702 ----
  	int err;
    
! 	if (!PyArg_ParseTuple(args, "s:eval", &script))
  		return NULL;
  
***************
*** 721,725 ****
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s", &script))
  		return NULL;
  
--- 721,725 ----
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s:globaleval", &script))
  		return NULL;
  
***************
*** 744,748 ****
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s", &fileName))
  		return NULL;
  
--- 744,748 ----
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s:evalfile", &fileName))
  		return NULL;
  
***************
*** 789,793 ****
  	char *msg;
  
! 	if (!PyArg_ParseTuple(args, "s", &msg))
  		return NULL;
  	ENTER_TCL
--- 789,793 ----
  	char *msg;
  
! 	if (!PyArg_ParseTuple(args, "s:adderrorinfo", &msg))
  		return NULL;
  	ENTER_TCL
***************
*** 817,821 ****
  		return NULL;
  
! 	if (PyArg_ParseTuple(args, "sO", &name1, &newValue)) {
  		/* XXX Merge? */
  		s = AsString(newValue, tmp);
--- 817,821 ----
  		return NULL;
  
! 	if (PyArg_ParseTuple(args, "sO:setvar", &name1, &newValue)) {
  		/* XXX Merge? */
  		s = AsString(newValue, tmp);
***************
*** 826,830 ****
  	else {
  		PyErr_Clear();
! 		if (PyArg_ParseTuple(args, "ssO", &name1, &name2, &newValue)) {
  			s = AsString (newValue, tmp);
  			ENTER_TCL
--- 826,830 ----
  	else {
  		PyErr_Clear();
! 		if (PyArg_ParseTuple(args, "ssO:setvar", &name1, &name2, &newValue)) {
  			s = AsString (newValue, tmp);
  			ENTER_TCL
***************
*** 874,878 ****
  	PyObject *res = NULL;
  
! 	if (!PyArg_ParseTuple(args, "s|s", &name1, &name2))
  		return NULL;
  	ENTER_TCL
--- 874,878 ----
  	PyObject *res = NULL;
  
! 	if (!PyArg_ParseTuple(args, "s|s:getvar", &name1, &name2))
  		return NULL;
  	ENTER_TCL
***************
*** 920,924 ****
  	int code;
  
! 	if (!PyArg_ParseTuple(args, "s|s", &name1, &name2))
  		return NULL;
  	ENTER_TCL
--- 920,924 ----
  	int code;
  
! 	if (!PyArg_ParseTuple(args, "s|s:unsetvar", &name1, &name2))
  		return NULL;
  	ENTER_TCL
***************
*** 968,972 ****
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	if (Tcl_GetInt(Tkapp_Interp(self), s, &v) == TCL_ERROR)
--- 968,972 ----
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s:getint", &s))
  		return NULL;
  	if (Tcl_GetInt(Tkapp_Interp(self), s, &v) == TCL_ERROR)
***************
*** 983,987 ****
  	double v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	if (Tcl_GetDouble(Tkapp_Interp(self), s, &v) == TCL_ERROR)
--- 983,987 ----
  	double v;
  
! 	if (!PyArg_ParseTuple(args, "s:getdouble", &s))
  		return NULL;
  	if (Tcl_GetDouble(Tkapp_Interp(self), s, &v) == TCL_ERROR)
***************
*** 998,1002 ****
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	if (Tcl_GetBoolean(Tkapp_Interp(self), s, &v) == TCL_ERROR)
--- 998,1002 ----
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s:getboolean", &s))
  		return NULL;
  	if (Tcl_GetBoolean(Tkapp_Interp(self), s, &v) == TCL_ERROR)
***************
*** 1014,1018 ****
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	ENTER_TCL
--- 1014,1018 ----
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "s:exprstring", &s))
  		return NULL;
  	ENTER_TCL
***************
*** 1037,1041 ****
  	long v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	ENTER_TCL
--- 1037,1041 ----
  	long v;
  
! 	if (!PyArg_ParseTuple(args, "s:exprlong", &s))
  		return NULL;
  	ENTER_TCL
***************
*** 1060,1064 ****
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	PyFPE_START_PROTECT("Tkapp_ExprDouble", return 0)
--- 1060,1064 ----
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "s:exprdouble", &s))
  		return NULL;
  	PyFPE_START_PROTECT("Tkapp_ExprDouble", return 0)
***************
*** 1085,1089 ****
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	ENTER_TCL
--- 1085,1089 ----
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s:exprboolean", &s))
  		return NULL;
  	ENTER_TCL
***************
*** 1111,1115 ****
  	int i;
  
! 	if (!PyArg_ParseTuple(args, "s", &list))
  		return NULL;
  
--- 1111,1115 ----
  	int i;
  
! 	if (!PyArg_ParseTuple(args, "s:splitlist", &list))
  		return NULL;
  
***************
*** 1141,1145 ****
  	char *list;
  
! 	if (!PyArg_ParseTuple(args, "s", &list))
  		return NULL;
  	return Split(list);
--- 1141,1145 ----
  	char *list;
  
! 	if (!PyArg_ParseTuple(args, "s:split", &list))
  		return NULL;
  	return Split(list);
***************
*** 1262,1266 ****
  	Tcl_Command err;
  
! 	if (!PyArg_ParseTuple(args, "sO", &cmdName, &func))
  		return NULL;
  	if (!PyCallable_Check(func)) {
--- 1262,1266 ----
  	Tcl_Command err;
  
! 	if (!PyArg_ParseTuple(args, "sO:createcommand", &cmdName, &func))
  		return NULL;
  	if (!PyCallable_Check(func)) {
***************
*** 1301,1305 ****
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s", &cmdName))
  		return NULL;
  	ENTER_TCL
--- 1301,1305 ----
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s:deletecommand", &cmdName))
  		return NULL;
  	ENTER_TCL
***************
*** 1444,1448 ****
  	FHANDLE tfile;
  
! 	if (!PyArg_ParseTuple(args, "OiO", &file, &mask, &func))
  		return NULL;
  	id = GetFileNo(file);
--- 1444,1448 ----
  	FHANDLE tfile;
  
! 	if (!PyArg_ParseTuple(args, "OiO:createfilehandler", &file, &mask, &func))
  		return NULL;
  	id = GetFileNo(file);
***************
*** 1477,1481 ****
  	FHANDLE tfile;
    
! 	if (!PyArg_ParseTuple(args, "O", &file))
  		return NULL;
  	id = GetFileNo(file);
--- 1477,1481 ----
  	FHANDLE tfile;
    
! 	if (!PyArg_ParseTuple(args, "O:deletefilehandler", &file))
  		return NULL;
  	id = GetFileNo(file);
***************
*** 1514,1518 ****
  	PyObject *func = v->func;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if (v->token != NULL) {
--- 1514,1518 ----
  	PyObject *func = v->func;
  
! 	if (!PyArg_ParseTuple(args, ":deletetimerhandler"))
  		return NULL;
  	if (v->token != NULL) {
***************
*** 1647,1651 ****
  	TkttObject *v;
  
! 	if (!PyArg_ParseTuple(args, "iO", &milliseconds, &func))
  		return NULL;
  	if (!PyCallable_Check(func)) {
--- 1647,1651 ----
  	TkttObject *v;
  
! 	if (!PyArg_ParseTuple(args, "iO:createtimerhandler", &milliseconds, &func))
  		return NULL;
  	if (!PyCallable_Check(func)) {
***************
*** 1673,1677 ****
  #endif
  
! 	if (!PyArg_ParseTuple(args, "|i", &threshold))
  		return NULL;
  
--- 1673,1677 ----
  #endif
  
! 	if (!PyArg_ParseTuple(args, "|i:mainloop", &threshold))
  		return NULL;
  
***************
*** 1722,1726 ****
  	int rv;
  
! 	if (!PyArg_ParseTuple(args, "|i", &flags))
  		return NULL;
  
--- 1722,1726 ----
  	int rv;
  
! 	if (!PyArg_ParseTuple(args, "|i:dooneevent", &flags))
  		return NULL;
  
***************
*** 1737,1741 ****
  {
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 1737,1741 ----
  {
  
! 	if (!PyArg_ParseTuple(args, ":quit"))
  		return NULL;
  
***************
*** 1751,1755 ****
  {
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 1751,1755 ----
  {
  
! 	if (!PyArg_ParseTuple(args, ":interpaddr"))
  		return NULL;
  
***************
*** 1863,1867 ****
  	className = "Tk";
    
! 	if (!PyArg_ParseTuple(args, "|zssi",
  			      &screenName, &baseName, &className,
  			      &interactive))
--- 1863,1867 ----
  	className = "Tk";
    
! 	if (!PyArg_ParseTuple(args, "|zssi:create",
  			      &screenName, &baseName, &className,
  			      &interactive))

Index: almodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/almodule.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** almodule.c	1999/12/10 15:12:11	1.22
--- almodule.c	2000/02/29 13:59:22	1.23
***************
*** 282,286 ****
  	int par;
  
! 	if (!PyArg_ParseTuple(args, "i", &par))
  		return NULL;
  
--- 282,286 ----
  	int par;
  
! 	if (!PyArg_ParseTuple(args, "i:SetConfig", &par))
  		return NULL;
  
***************
*** 300,304 ****
  	int par;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	
--- 300,304 ----
  	int par;
  
! 	if (!PyArg_ParseTuple(args, ":GetConfig"))
  		return NULL;
  	
***************
*** 398,402 ****
  	double maximum_value;
  
! 	if (!PyArg_ParseTuple(args, "d", &maximum_value))
  		return NULL;
  	if (alSetFloatMax(self->config, maximum_value) < 0)
--- 398,402 ----
  	double maximum_value;
  
! 	if (!PyArg_ParseTuple(args, "d:SetFloatMax", &maximum_value))
  		return NULL;
  	if (alSetFloatMax(self->config, maximum_value) < 0)
***************
*** 418,422 ****
  	double maximum_value;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((maximum_value = alGetFloatMax(self->config)) == 0)
--- 418,422 ----
  	double maximum_value;
  
! 	if (!PyArg_ParseTuple(args, ":GetFloatMax"))
  		return NULL;
  	if ((maximum_value = alGetFloatMax(self->config)) == 0)
***************
*** 487,491 ****
  	long par;
  
! 	if (!PyArg_ParseTuple(args, "l", &par))
  		return NULL;
  
--- 487,491 ----
  	long par;
  
! 	if (!PyArg_ParseTuple(args, "l:SetConfig", &par))
  		return NULL;
  
***************
*** 505,509 ****
  	long par;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	
--- 505,509 ----
  	long par;
  
! 	if (!PyArg_ParseTuple(args, ":GetConfig"))
  		return NULL;
  	
***************
*** 587,591 ****
  	double arg;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return 0;
  	if ((arg = ALgetfloatmax(self->config)) == 0)
--- 587,591 ----
  	double arg;
  
! 	if (!PyArg_ParseTuple(args, ":GetFloatMax"))
  		return 0;
  	if ((arg = ALgetfloatmax(self->config)) == 0)
***************
*** 601,605 ****
  	double arg;
  
! 	if (!PyArg_ParseTuple(args, "d", &arg))
  		return 0;
  	if (ALsetfloatmax(self->config, arg) == -1)
--- 601,605 ----
  	double arg;
  
! 	if (!PyArg_ParseTuple(args, "d:SetFloatMax", &arg))
  		return 0;
  	if (ALsetfloatmax(self->config, arg) == -1)
***************
*** 724,728 ****
  {
  	alcobject *config;
! 	if (!PyArg_ParseTuple(args, "O!", &Alctype, &config))
  		return NULL;
  	if (alSetConfig(self->port, config->config) < 0)
--- 724,728 ----
  {
  	alcobject *config;
! 	if (!PyArg_ParseTuple(args, "O!:SetConfig", &Alctype, &config))
  		return NULL;
  	if (alSetConfig(self->port, config->config) < 0)
***************
*** 743,747 ****
  {
  	ALconfig config;
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((config = alGetConfig(self->port)) == NULL)
--- 743,747 ----
  {
  	ALconfig config;
! 	if (!PyArg_ParseTuple(args, ":GetConfig"))
  		return NULL;
  	if ((config = alGetConfig(self->port)) == NULL)
***************
*** 762,766 ****
  	int resource;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((resource = alGetResource(self->port)) == 0)
--- 762,766 ----
  	int resource;
  
! 	if (!PyArg_ParseTuple(args, ":GetResource"))
  		return NULL;
  	if ((resource = alGetResource(self->port)) == 0)
***************
*** 781,785 ****
  	int fd;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 781,785 ----
  	int fd;
  
! 	if (!PyArg_ParseTuple(args, ":GetFD"))
  		return NULL;
  
***************
*** 802,806 ****
  	int filled;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((filled = alGetFilled(self->port)) < 0)
--- 802,806 ----
  	int filled;
  
! 	if (!PyArg_ParseTuple(args, ":GetFilled"))
  		return NULL;
  	if ((filled = alGetFilled(self->port)) < 0)
***************
*** 821,825 ****
  	int fillable;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((fillable = alGetFillable(self->port)) < 0)
--- 821,825 ----
  	int fillable;
  
! 	if (!PyArg_ParseTuple(args, ":GetFillable"))
  		return NULL;
  	if ((fillable = alGetFillable(self->port)) < 0)
***************
*** 845,849 ****
  	ALconfig c;
  
! 	if (!PyArg_ParseTuple(args, "i", &framecount))
  		return NULL;
  	if (framecount < 0) {
--- 845,849 ----
  	ALconfig c;
  
! 	if (!PyArg_ParseTuple(args, "i:ReadFrames", &framecount))
  		return NULL;
  	if (framecount < 0) {
***************
*** 911,915 ****
  	int framecount;
  
! 	if (!PyArg_ParseTuple(args, "i", &framecount))
  		return NULL;
  
--- 911,915 ----
  	int framecount;
  
! 	if (!PyArg_ParseTuple(args, "i:DiscardFrames", &framecount))
  		return NULL;
  
***************
*** 936,940 ****
  	int framecount;
  
! 	if (!PyArg_ParseTuple(args, "i", &framecount))
  		return NULL;
  
--- 936,940 ----
  	int framecount;
  
! 	if (!PyArg_ParseTuple(args, "i:ZeroFrames", &framecount))
  		return NULL;
  
***************
*** 964,968 ****
  	int fillpoint;
  
! 	if (!PyArg_ParseTuple(args, "i", &fillpoint))
  		return NULL;
  
--- 964,968 ----
  	int fillpoint;
  
! 	if (!PyArg_ParseTuple(args, "i:SetFillPoint", &fillpoint))
  		return NULL;
  
***************
*** 986,990 ****
  	int fillpoint;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 986,990 ----
  	int fillpoint;
  
! 	if (!PyArg_ParseTuple(args, ":GetFillPoint"))
  		return NULL;
  
***************
*** 1007,1011 ****
  	stamp_t fnum;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 1007,1011 ----
  	stamp_t fnum;
  
! 	if (!PyArg_ParseTuple(args, ":GetFrameNumber"))
  		return NULL;
  
***************
*** 1029,1033 ****
  	PyObject *ret, *v0, *v1;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if (alGetFrameTime(self->port, &fnum, &time) < 0)
--- 1029,1033 ----
  	PyObject *ret, *v0, *v1;
  
! 	if (!PyArg_ParseTuple(args, ":GetFrameTime"))
  		return NULL;
  	if (alGetFrameTime(self->port, &fnum, &time) < 0)
***************
*** 1061,1065 ****
  	ALconfig c;
  
! 	if (!PyArg_ParseTuple(args, "s#", &samples, &length))
  		return NULL;
  	c = alGetConfig(self->port);
--- 1061,1065 ----
  	ALconfig c;
  
! 	if (!PyArg_ParseTuple(args, "s#:WriteFrames", &samples, &length))
  		return NULL;
  	c = alGetConfig(self->port);
***************
*** 1124,1128 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if (alClosePort(self->port) < 0)
--- 1124,1128 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":ClosePort"))
  		return NULL;
  	if (alClosePort(self->port) < 0)
***************
*** 1141,1145 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if (ALcloseport(self->port) < 0)
--- 1141,1145 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":ClosePort"))
  		return NULL;
  	if (ALcloseport(self->port) < 0)
***************
*** 1151,1155 ****
  
  static PyObject *
! alp_getfd (self, args)
  	alpobject *self;
  	PyObject *args;
--- 1151,1155 ----
  
  static PyObject *
! alp_getfd(self, args)
  	alpobject *self;
  	PyObject *args;
***************
*** 1157,1161 ****
  	int fd;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((fd = ALgetfd(self-> port)) == -1)
--- 1157,1161 ----
  	int fd;
  
! 	if (!PyArg_ParseTuple(args, ":GetFD"))
  		return NULL;
  	if ((fd = ALgetfd(self-> port)) == -1)
***************
*** 1171,1175 ****
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((count = ALgetfilled(self-> port)) == -1)
--- 1171,1175 ----
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ":GetFilled"))
  		return NULL;
  	if ((count = ALgetfilled(self-> port)) == -1)
***************
*** 1185,1189 ****
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((count = ALgetfillable(self-> port)) == -1)
--- 1185,1189 ----
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ":GetFillable"))
  		return NULL;
  	if ((count = ALgetfillable(self-> port)) == -1)
***************
*** 1203,1207 ****
  	int ret;
  
! 	if (!PyArg_ParseTuple(args, "l", &count))
  		return NULL;
  
--- 1203,1207 ----
  	int ret;
  
! 	if (!PyArg_ParseTuple(args, "l:readsamps", &count))
  		return NULL;
  
***************
*** 1249,1253 ****
  	int ret;
  
! 	if (!PyArg_ParseTuple(args, "s#", &buf, &size))
  		return NULL;
  
--- 1249,1253 ----
  	int ret;
  
! 	if (!PyArg_ParseTuple(args, "s#:writesamps", &buf, &size))
  		return NULL;
  
***************
*** 1282,1286 ****
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((count = ALgetfillpoint(self->port)) == -1)
--- 1282,1286 ----
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ":GetFillPoint"))
  		return NULL;
  	if ((count = ALgetfillpoint(self->port)) == -1)
***************
*** 1290,1294 ****
  
  static PyObject *
! alp_setfillpoint (self, args)
  	alpobject *self;
  	PyObject *args;
--- 1290,1294 ----
  
  static PyObject *
! alp_setfillpoint(self, args)
  	alpobject *self;
  	PyObject *args;
***************
*** 1296,1300 ****
  	long count;
  
! 	if (!PyArg_ParseTuple(args, "l", &count))
  		return NULL;
  	if (ALsetfillpoint(self->port, count) == -1)
--- 1296,1300 ----
  	long count;
  
! 	if (!PyArg_ParseTuple(args, "l:SetFillPoint", &count))
  		return NULL;
  	if (ALsetfillpoint(self->port, count) == -1)
***************
*** 1311,1315 ****
  	alcobject *config;
  
! 	if (!PyArg_ParseTuple(args, "O!", &Alctype, &config))
  		return NULL;
  	if (ALsetconfig(self->port, config->config) == -1)
--- 1311,1315 ----
  	alcobject *config;
  
! 	if (!PyArg_ParseTuple(args, "O!:SetConfig", &Alctype, &config))
  		return NULL;
  	if (ALsetconfig(self->port, config->config) == -1)
***************
*** 1326,1330 ****
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	config = ALgetconfig(self->port);
--- 1326,1330 ----
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ":GetConfig"))
  		return NULL;
  	config = ALgetconfig(self->port);
***************
*** 1505,1509 ****
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((config = alNewConfig()) == NULL)
--- 1505,1509 ----
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ":NewConfig"))
  		return NULL;
  	if ((config = alNewConfig()) == NULL)
***************
*** 1525,1529 ****
  	alcobject *config = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ss|O!", &name, &dir, &Alctype, &config))
  		return NULL;
  	if ((port = alOpenPort(name, dir, config ? config->config : NULL)) == NULL)
--- 1525,1529 ----
  	alcobject *config = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ss|O!:OpenPort", &name, &dir, &Alctype, &config))
  		return NULL;
  	if ((port = alOpenPort(name, dir, config ? config->config : NULL)) == NULL)
***************
*** 1546,1550 ****
  	PyObject *propobj = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ii|O!", &source, &dest, &PyList_Type, &propobj))
  		return NULL;
  	if (propobj != NULL) {
--- 1546,1550 ----
  	PyObject *propobj = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ii|O!:Connect", &source, &dest, &PyList_Type, &propobj))
  		return NULL;
  	if (propobj != NULL) {
***************
*** 1585,1589 ****
  	int res;
  
! 	if (!PyArg_ParseTuple(args, "i", &res))
  		return NULL;
  	if (alDisconnect(res) < 0)
--- 1585,1589 ----
  	int res;
  
! 	if (!PyArg_ParseTuple(args, "i:Disconnect", &res))
  		return NULL;
  	if (alDisconnect(res) < 0)
***************
*** 1608,1612 ****
  	ALparamInfo *pinfo;
  
! 	if (!PyArg_ParseTuple(args, "iO!", &resource, &PyList_Type, &pvslist))
  		return NULL;
  	npvs = PyList_Size(pvslist);
--- 1608,1612 ----
  	ALparamInfo *pinfo;
  
! 	if (!PyArg_ParseTuple(args, "iO!:GetParams", &resource, &PyList_Type, &pvslist))
  		return NULL;
  	npvs = PyList_Size(pvslist);
***************
*** 1754,1758 ****
  	int npvs, i;
  
! 	if (!PyArg_ParseTuple(args, "iO!", &resource, &PyList_Type, &pvslist))
  		return NULL;
  	npvs = python2params(resource, -1, pvslist, &pvs, &pinfo);
--- 1754,1758 ----
  	int npvs, i;
  
! 	if (!PyArg_ParseTuple(args, "iO!:SetParams", &resource, &PyList_Type, &pvslist))
  		return NULL;
  	npvs = python2params(resource, -1, pvslist, &pvs, &pinfo);
***************
*** 1805,1809 ****
  	PyObject *res = NULL, *item;
  
! 	if (!PyArg_ParseTuple(args, "ii|O!", &resource, &param,
  			      &PyList_Type, &qualobj))
  		return NULL;
--- 1805,1809 ----
  	PyObject *res = NULL, *item;
  
! 	if (!PyArg_ParseTuple(args, "ii|O!:QueryValues", &resource, &param,
  			      &PyList_Type, &qualobj))
  		return NULL;
***************
*** 1882,1886 ****
  	PyObject *v, *item;;
  
! 	if (!PyArg_ParseTuple(args, "ii", &res, &param))
  		return NULL;
  	if (alGetParamInfo(res, param, &pinfo) < 0)
--- 1882,1886 ----
  	PyObject *v, *item;;
  
! 	if (!PyArg_ParseTuple(args, "ii:GetParamInfo", &res, &param))
  		return NULL;
  	if (alGetParamInfo(res, param, &pinfo) < 0)
***************
*** 1966,1970 ****
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "isi", &start_res, &name, &type))
  		return NULL;
  	if ((res = alGetResourceByName(start_res, name, type)) == 0)
--- 1966,1970 ----
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "isi:GetResourceByName", &start_res, &name, &type))
  		return NULL;
  	if ((res = alGetResourceByName(start_res, name, type)) == 0)
***************
*** 1984,1988 ****
  	int type, subtype;
  
! 	if (!PyArg_ParseTuple(args, "ii", &type, &subtype))
  		return NULL;
  	return PyInt_FromLong((long) alIsSubtype(type, subtype));
--- 1984,1988 ----
  	int type, subtype;
  
! 	if (!PyArg_ParseTuple(args, "ii:IsSubtype", &type, &subtype))
  		return NULL;
  	return PyInt_FromLong((long) alIsSubtype(type, subtype));
***************
*** 1999,2003 ****
  {
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	Py_INCREF(Py_None);
--- 1999,2003 ----
  {
  
! 	if (!PyArg_ParseTuple(args, ":SetErrorHandler"))
  		return NULL;
  	Py_INCREF(Py_None);
***************
*** 2017,2021 ****
  	alcobject *config = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ss|O!", &name, &dir, &Alctype, &config))
  		return NULL;
  	if ((port = ALopenport(name, dir, config ? config->config : NULL)) == NULL)
--- 2017,2021 ----
  	alcobject *config = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ss|O!:OpenPort", &name, &dir, &Alctype, &config))
  		return NULL;
  	if ((port = ALopenport(name, dir, config ? config->config : NULL)) == NULL)
***************
*** 2030,2034 ****
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((config = ALnewconfig ()) == NULL)
--- 2030,2034 ----
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ":NewConfig"))
  		return NULL;
  	if ((config = ALnewconfig ()) == NULL)
***************
*** 2048,2052 ****
  	int i;
  
! 	if (!PyArg_ParseTuple(args, "l", &device))
  		return NULL;
  	if ((length = ALqueryparams(device, PVdummy, 2L)) == -1)
--- 2048,2052 ----
  	int i;
  
! 	if (!PyArg_ParseTuple(args, "l:queryparams", &device))
  		return NULL;
  	if ((length = ALqueryparams(device, PVdummy, 2L)) == -1)
***************
*** 2128,2132 ****
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "ll", &device, &descriptor))
  		return NULL;
  	if ((name = ALgetname(device, descriptor)) == NULL)
--- 2128,2132 ----
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "ll:getname", &device, &descriptor))
  		return NULL;
  	if ((name = ALgetname(device, descriptor)) == NULL)
***************
*** 2141,2145 ****
  	long device, descriptor, value;
  
! 	if (!PyArg_ParseTuple(args, "ll", &device, &descriptor))
  		return NULL;
  	if ((value = ALgetdefault(device, descriptor)) == -1)
--- 2141,2145 ----
  	long device, descriptor, value;
  
! 	if (!PyArg_ParseTuple(args, "ll:getdefault", &device, &descriptor))
  		return NULL;
  	if ((value = ALgetdefault(device, descriptor)) == -1)
***************
*** 2154,2158 ****
  	long device, descriptor, min, max;
  
! 	if (!PyArg_ParseTuple(args, "ll", &device, &descriptor))
  		return NULL;
  	min = -1;
--- 2154,2158 ----
  	long device, descriptor, min, max;
  
! 	if (!PyArg_ParseTuple(args, "ll:getminmax", &device, &descriptor))
  		return NULL;
  	min = -1;

Index: audioop.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/audioop.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** audioop.c	1999/09/07 14:24:05	1.34
--- audioop.c	2000/02/29 13:59:22	1.35
***************
*** 982,986 ****
  	weightA = 1;
  	weightB = 0;
! 	if (!PyArg_ParseTuple(args, "s#iiiiO|ii", &cp, &len, &size, &nchannels,
  			      &inrate, &outrate, &state, &weightA, &weightB))
  		return NULL;
--- 982,986 ----
  	weightA = 1;
  	weightB = 0;
! 	if (!PyArg_ParseTuple(args, "s#iiiiO|ii:ratecv", &cp, &len, &size, &nchannels,
  			      &inrate, &outrate, &state, &weightA, &weightB))
  		return NULL;
***************
*** 1035,1039 ****
  		for (chan = 0; chan < nchannels; chan++) {
  			if (!PyArg_ParseTuple(PyTuple_GetItem(samps, chan),
! 					      "ii",&prev_i[chan],&cur_i[chan]))
  				goto exit;
  		}
--- 1035,1039 ----
  		for (chan = 0; chan < nchannels; chan++) {
  			if (!PyArg_ParseTuple(PyTuple_GetItem(samps, chan),
! 					      "ii:ratecv",&prev_i[chan],&cur_i[chan]))
  				goto exit;
  		}

Index: binascii.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/binascii.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** binascii.c	2000/02/16 21:11:52	2.18
--- binascii.c	2000/02/29 13:59:22	2.19
***************
*** 214,218 ****
  	int ascii_len, bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "t#", &ascii_data, &ascii_len) )
  		return NULL;
  
--- 214,218 ----
  	int ascii_len, bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "t#:a2b_uu", &ascii_data, &ascii_len) )
  		return NULL;
  
***************
*** 291,295 ****
  	int bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#", &bin_data, &bin_len) )
  		return NULL;
  	if ( bin_len > 45 ) {
--- 291,295 ----
  	int bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#:b2a_uu", &bin_data, &bin_len) )
  		return NULL;
  	if ( bin_len > 45 ) {
***************
*** 373,377 ****
  	int quad_pos = 0;
  	
! 	if ( !PyArg_ParseTuple(args, "t#", &ascii_data, &ascii_len) )
  		return NULL;
  
--- 373,377 ----
  	int quad_pos = 0;
  	
! 	if ( !PyArg_ParseTuple(args, "t#:a2b_base64", &ascii_data, &ascii_len) )
  		return NULL;
  
***************
*** 457,461 ****
  	int bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#", &bin_data, &bin_len) )
  		return NULL;
  	if ( bin_len > BASE64_MAXBIN ) {
--- 457,461 ----
  	int bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#:b2a_base64", &bin_data, &bin_len) )
  		return NULL;
  	if ( bin_len > BASE64_MAXBIN ) {
***************
*** 511,515 ****
  	int done = 0;
  	
! 	if ( !PyArg_ParseTuple(args, "t#", &ascii_data, &len) )
  		return NULL;
  
--- 511,515 ----
  	int done = 0;
  	
! 	if ( !PyArg_ParseTuple(args, "t#:a2b_hqx", &ascii_data, &len) )
  		return NULL;
  
***************
*** 574,578 ****
  	int in, inend, len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#", &in_data, &len) )
  		return NULL;
  
--- 574,578 ----
  	int in, inend, len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#:rlecode_hqx", &in_data, &len) )
  		return NULL;
  
***************
*** 625,629 ****
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#", &bin_data, &len) )
  		return NULL;
  
--- 625,629 ----
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#:b2a_hqx", &bin_data, &len) )
  		return NULL;
  
***************
*** 665,669 ****
  	int in_len, out_len, out_len_left;
  
! 	if ( !PyArg_ParseTuple(args, "s#", &in_data, &in_len) )
  		return NULL;
  
--- 665,669 ----
  	int in_len, out_len, out_len_left;
  
! 	if ( !PyArg_ParseTuple(args, "s#:rledecode_hqx", &in_data, &in_len) )
  		return NULL;
  
***************
*** 763,767 ****
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#i", &bin_data, &len, &crc) )
  		return NULL;
  
--- 763,767 ----
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#i:crc_hqx", &bin_data, &len, &crc) )
  		return NULL;
  
***************
*** 903,907 ****
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#|l", &bin_data, &len, &crc) )
  		return NULL;
  
--- 903,907 ----
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#|l:crc32", &bin_data, &len, &crc) )
  		return NULL;
  

Index: bsddbmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/bsddbmodule.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** bsddbmodule.c	1999/09/20 13:28:18	1.16
--- bsddbmodule.c	2000/02/29 13:59:22	1.17
***************
*** 698,702 ****
  	int lorder = 0;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiii",
  			      &file, &flag, &mode,
  			      &bsize, &ffactor, &nelem, &cachesize,
--- 698,702 ----
  	int lorder = 0;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiii:hashopen",
  			      &file, &flag, &mode,
  			      &bsize, &ffactor, &nelem, &cachesize,
***************
*** 751,755 ****
  	int lorder = 0;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiii",
  			      &file, &flag, &mode,
  			      &btflags, &cachesize, &maxkeypage, &minkeypage,
--- 751,755 ----
  	int lorder = 0;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiii:btopen",
  			      &file, &flag, &mode,
  			      &btflags, &cachesize, &maxkeypage, &minkeypage,
***************
*** 806,810 ****
  	char *bfname = NULL;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiiss",
  			      &file, &flag, &mode,
  			      &rnflags, &cachesize, &psize, &lorder,
--- 806,810 ----
  	char *bfname = NULL;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiiss:rnopen",
  			      &file, &flag, &mode,
  			      &rnflags, &cachesize, &psize, &lorder,

Index: cPickle.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.37
retrieving revision 2.38
diff -C2 -r2.37 -r2.38
*** cPickle.c	1999/07/13 15:18:58	2.37
--- cPickle.c	2000/02/29 13:59:22	2.38
***************
*** 1869,1873 ****
  static PyObject *
  Pickle_clear_memo(Picklerobject *self, PyObject *args) {
!   if (args && ! PyArg_ParseTuple(args,"")) return NULL;
    if (self->memo) PyDict_Clear(self->memo);
    Py_INCREF(Py_None);
--- 1869,1873 ----
  static PyObject *
  Pickle_clear_memo(Picklerobject *self, PyObject *args) {
!   if (args && ! PyArg_ParseTuple(args,":clear_memo")) return NULL;
    if (self->memo) PyDict_Clear(self->memo);
    Py_INCREF(Py_None);
***************
*** 1883,1887 ****
    Pdata *data;
  
!   if (args && ! PyArg_ParseTuple(args,"|i",&clear)) return NULL;
  
    /* Check to make sure we are based on a list */
--- 1883,1887 ----
    Pdata *data;
  
!   if (args && ! PyArg_ParseTuple(args,"|i:getvalue",&clear)) return NULL;
  
    /* Check to make sure we are based on a list */
***************
*** 2015,2019 ****
      int get=0;
  
!     UNLESS (PyArg_ParseTuple(args, "O|i", &ob, &get))
          return NULL;
  
--- 2015,2019 ----
      int get=0;
  
!     UNLESS (PyArg_ParseTuple(args, "O|i:dump", &ob, &get))
          return NULL;
  
***************
*** 2133,2140 ****
  
      bin=1;
!     if (! PyArg_ParseTuple(args, "|i", &bin)) {
          PyErr_Clear();
          bin=0;
!         if (! PyArg_ParseTuple(args, "O|i", &file, &bin))
            return NULL;
        }
--- 2133,2140 ----
  
      bin=1;
!     if (! PyArg_ParseTuple(args, "|i:Pickler", &bin)) {
          PyErr_Clear();
          bin=0;
!         if (! PyArg_ParseTuple(args, "O|i:Pickler", &file, &bin))
            return NULL;
        }
***************
*** 3854,3858 ****
  static PyObject *
  Unpickler_load(Unpicklerobject *self, PyObject *args) {
!     UNLESS (PyArg_ParseTuple(args, "")) 
          return NULL;
  
--- 3854,3858 ----
  static PyObject *
  Unpickler_load(Unpicklerobject *self, PyObject *args) {
!     UNLESS (PyArg_ParseTuple(args, ":load")) 
          return NULL;
  
***************
*** 3862,3866 ****
  static PyObject *
  Unpickler_noload(Unpicklerobject *self, PyObject *args) {
!     UNLESS (PyArg_ParseTuple(args, "")) 
          return NULL;
  
--- 3862,3866 ----
  static PyObject *
  Unpickler_noload(Unpicklerobject *self, PyObject *args) {
!     UNLESS (PyArg_ParseTuple(args, ":noload")) 
          return NULL;
  
***************
*** 3970,3974 ****
      PyObject *file;
    
!     UNLESS (PyArg_ParseTuple(args, "O", &file))
          return NULL;
      return (PyObject *)newUnpicklerobject(file);
--- 3970,3974 ----
      PyObject *file;
    
!     UNLESS (PyArg_ParseTuple(args, "O:Unpickler", &file))
          return NULL;
      return (PyObject *)newUnpicklerobject(file);
***************
*** 4111,4115 ****
      int bin = 0;
  
!     UNLESS (PyArg_ParseTuple(args, "O|i", &ob, &bin))
          goto finally;
  
--- 4111,4115 ----
      int bin = 0;
  
!     UNLESS (PyArg_ParseTuple(args, "O|i:dumps", &ob, &bin))
          goto finally;
  
***************
*** 4138,4142 ****
      PyObject *ob, *res = NULL;
  
!     UNLESS (PyArg_ParseTuple(args, "O", &ob))
          goto finally;
  
--- 4138,4142 ----
      PyObject *ob, *res = NULL;
  
!     UNLESS (PyArg_ParseTuple(args, "O:load", &ob))
          goto finally;
  
***************
*** 4158,4162 ****
      Unpicklerobject *unpickler = 0;
  
!     UNLESS (PyArg_ParseTuple(args, "S", &ob))
          goto finally;
  
--- 4158,4162 ----
      Unpicklerobject *unpickler = 0;
  
!     UNLESS (PyArg_ParseTuple(args, "S:loads", &ob))
          goto finally;
  

Index: cStringIO.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/cStringIO.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** cStringIO.c	1999/06/15 14:35:48	2.17
--- cStringIO.c	2000/02/29 13:59:22	2.18
***************
*** 135,139 ****
    int position, mode = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "i|i", &position, &mode)) {
      return NULL;
    }
--- 135,139 ----
    int position, mode = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "i|i:seek", &position, &mode)) {
      return NULL;
    }
***************
*** 188,192 ****
    char *output;
  
!   UNLESS(PyArg_ParseTuple(args, "|i", &n)) return NULL;
  
    n=O_cread((PyObject*)self,&output,n);
--- 188,192 ----
    char *output;
  
!   UNLESS(PyArg_ParseTuple(args, "|i:read", &n)) return NULL;
  
    n=O_cread((PyObject*)self,&output,n);
***************
*** 265,269 ****
    int l;
  
!   UNLESS(PyArg_ParseTuple(args, "O", &s)) return NULL;
    UNLESS(-1 != (l=PyString_Size(s))) return NULL;
    UNLESS(c=PyString_AsString(s)) return NULL;
--- 265,269 ----
    int l;
  
!   UNLESS(PyArg_ParseTuple(args, "O:write", &s)) return NULL;
    UNLESS(-1 != (l=PyString_Size(s))) return NULL;
    UNLESS(c=PyString_AsString(s)) return NULL;
***************
*** 287,291 ****
  
    use_pos=Py_None;
!   UNLESS(PyArg_ParseTuple(args,"|O",&use_pos)) return NULL;
    if(PyObject_IsTrue(use_pos)) {
        s=self->pos;
--- 287,291 ----
  
    use_pos=Py_None;
!   UNLESS(PyArg_ParseTuple(args,"|O:getval",&use_pos)) return NULL;
    if(PyObject_IsTrue(use_pos)) {
        s=self->pos;
***************
*** 351,355 ****
    static PyObject *string_joinfields = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "O", &args)) {
      return NULL;
    }
--- 351,355 ----
    static PyObject *string_joinfields = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "O:writelines", &args)) {
      return NULL;
    }
***************
*** 501,505 ****
    int position, mode = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "i|i", &position, &mode)) {
      return NULL;
    }
--- 501,505 ----
    int position, mode = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "i|i:seek", &position, &mode)) {
      return NULL;
    }
***************
*** 604,608 ****
    PyObject *s=0;
  
!   UNLESS(PyArg_ParseTuple(args, "|O", &s)) return NULL;
    if(s) return newIobject(s);
    return newOobject(128);
--- 604,608 ----
    PyObject *s=0;
  
!   UNLESS(PyArg_ParseTuple(args, "|O:StringIO", &s)) return NULL;
    if(s) return newIobject(s);
    return newOobject(128);

Index: cdmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/cdmodule.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** cdmodule.c	1997/10/01 04:43:39	1.17
--- cdmodule.c	2000/02/29 13:59:23	1.18
***************
*** 51,55 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 51,55 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":allowremoval"))
  		return NULL;
  
***************
*** 65,69 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 65,69 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":preventremoval"))
  		return NULL;
  
***************
*** 79,83 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 79,83 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":bestreadsize"))
  		return NULL;
  
***************
*** 90,94 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 90,94 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":close"))
  		return NULL;
  
***************
*** 110,114 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 110,114 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ":eject"))
  		return NULL;
  
***************
*** 133,137 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 133,137 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ":getstatus"))
  		return NULL;
  
***************
*** 158,162 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "i", &track))
  		return NULL;
  
--- 158,162 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "i:gettrackinfo", &track))
  		return NULL;
  
***************
*** 182,186 ****
  	int min, sec, frame;
  
! 	if (!PyArg_ParseTuple(args, "iii", &min, &sec, &frame))
  		return NULL;
  
--- 182,186 ----
  	int min, sec, frame;
  
! 	if (!PyArg_ParseTuple(args, "iii:msftoblock", &min, &sec, &frame))
  		return NULL;
  
***************
*** 197,201 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "ii", &start, &play))
  		return NULL;
  
--- 197,201 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "ii:play", &start, &play))
  		return NULL;
  
***************
*** 221,225 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "iiii", &min, &sec, &frame, &play))
  		return NULL;
  
--- 221,225 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "iiii:playabs", &min, &sec, &frame, &play))
  		return NULL;
  
***************
*** 245,249 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "ii", &start, &play))
  		return NULL;
  
--- 245,249 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "ii:playtrack", &start, &play))
  		return NULL;
  
***************
*** 269,273 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "iiiii", &track, &min, &sec,
  			      &frame, &play))
  		return NULL;
--- 269,273 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "iiiii:playtrackabs", &track, &min, &sec,
  			      &frame, &play))
  		return NULL;
***************
*** 294,298 ****
  	PyObject *result;
  
! 	if (!PyArg_ParseTuple(args, "i", &numframes))
  		return NULL;
  
--- 294,298 ----
  	PyObject *result;
  
! 	if (!PyArg_ParseTuple(args, "i:readda", &numframes))
  		return NULL;
  
***************
*** 323,327 ****
  	long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "iii", &min, &sec, &frame))
  		return NULL;
  
--- 323,327 ----
  	long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "iii:seek", &min, &sec, &frame))
  		return NULL;
  
***************
*** 343,347 ****
  	long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "i", &track))
  		return NULL;
  
--- 343,347 ----
  	long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "i:seektrack", &track))
  		return NULL;
  
***************
*** 362,366 ****
  	unsigned long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "l", &PyTryBlock))
  		return NULL;
  
--- 362,366 ----
  	unsigned long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "l:seekblock", &PyTryBlock))
  		return NULL;
  
***************
*** 381,385 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 381,385 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ":stop"))
  		return NULL;
  
***************
*** 404,408 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 404,408 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ":togglepause"))
  		return NULL;
  
***************
*** 504,508 ****
  	dev = NULL;
  	direction = "r";
! 	if (!PyArg_ParseTuple(args, "|zs", &dev, &direction))
  		return NULL;
  
--- 504,508 ----
  	dev = NULL;
  	direction = "r";
! 	if (!PyArg_ParseTuple(args, "|zs:open", &dev, &direction))
  		return NULL;
  
***************
*** 606,610 ****
  	int i;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 606,610 ----
  	int i;
  
! 	if (!PyArg_ParseTuple(args, ":deleteparser"))
  		return NULL;
  
***************
*** 633,637 ****
  	CDFRAME *p;
  
! 	if (!PyArg_ParseTuple(args, "s#", &cdfp, &length))
  		return NULL;
  
--- 633,637 ----
  	CDFRAME *p;
  
! 	if (!PyArg_ParseTuple(args, "s#:parseframe", &cdfp, &length))
  		return NULL;
  
***************
*** 661,665 ****
  	int type;
  
! 	if (!PyArg_ParseTuple(args, "i", &type))
  		return NULL;
  
--- 661,665 ----
  	int type;
  
! 	if (!PyArg_ParseTuple(args, "i:removecallback", &type))
  		return NULL;
  
***************
*** 686,690 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 686,690 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":resetparser"))
  		return NULL;
  
***************
*** 704,708 ****
  
  	/* XXX - more work here */
! 	if (!PyArg_ParseTuple(args, "iOO", &type, &func, &funcarg))
  		return NULL;
  
--- 704,708 ----
  
  	/* XXX - more work here */
! 	if (!PyArg_ParseTuple(args, "iOO:addcallback", &type, &func, &funcarg))
  		return NULL;
  
***************
*** 817,821 ****
  	CDPARSER *cdp;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	cdp = CDcreateparser();
--- 817,821 ----
  	CDPARSER *cdp;
  
! 	if (!PyArg_ParseTuple(args, ":createparser"))
  		return NULL;
  	cdp = CDcreateparser();
***************
*** 834,838 ****
  	int min, sec, frame;
  
! 	if (!PyArg_ParseTuple(args, "iii", &min, &sec, &frame))
  		return NULL;
  
--- 834,838 ----
  	int min, sec, frame;
  
! 	if (!PyArg_ParseTuple(args, "iii:msftoframe", &min, &sec, &frame))
  		return NULL;
  

Index: dbmmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/dbmmodule.c,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** dbmmodule.c	1998/12/04 18:49:44	2.15
--- dbmmodule.c	2000/02/29 13:59:23	2.16
***************
*** 287,291 ****
  	int mode = 0666;
  
!         if ( !PyArg_ParseTuple(args, "s|si", &name, &flags, &mode) )
  		return NULL;
  	if ( strcmp(flags, "r") == 0 )
--- 287,291 ----
  	int mode = 0666;
  
!         if ( !PyArg_ParseTuple(args, "s|si:open", &name, &flags, &mode) )
  		return NULL;
  	if ( strcmp(flags, "r") == 0 )

Index: fcntlmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/fcntlmodule.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** fcntlmodule.c	1999/01/06 18:44:23	2.18
--- fcntlmodule.c	2000/02/29 13:59:23	2.19
***************
*** 235,239 ****
  	PyObject *lenobj = NULL, *startobj = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ii|OOi", &fd, &code,
  			      &lenobj, &startobj, &whence))
  	    return NULL;
--- 235,239 ----
  	PyObject *lenobj = NULL, *startobj = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ii|OOi:lockf", &fd, &code,
  			      &lenobj, &startobj, &whence))
  	    return NULL;

Index: gdbmmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/gdbmmodule.c,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** gdbmmodule.c	2000/02/07 17:19:41	2.20
--- gdbmmodule.c	2000/02/29 13:59:23	2.21
***************
*** 491,495 ****
  	int mode = 0666;
  
! 	if ( !PyArg_ParseTuple(args, "s|si", &name, &flags, &mode) )
  		return NULL;
  	switch (flags[0]) {
--- 491,495 ----
  	int mode = 0666;
  
! 	if ( !PyArg_ParseTuple(args, "s|si:open", &name, &flags, &mode) )
  		return NULL;
  	switch (flags[0]) {

Index: md5module.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/md5module.c,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** md5module.c	2000/02/04 20:32:35	2.13
--- md5module.c	2000/02/29 13:59:23	2.14
***************
*** 238,242 ****
  	int len = 0;
  
! 	if (!PyArg_ParseTuple(args, "|s#", &cp, &len))
  		return NULL;
  
--- 238,242 ----
  	int len = 0;
  
! 	if (!PyArg_ParseTuple(args, "|s#:new", &cp, &len))
  		return NULL;
  

Index: newmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/newmodule.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** newmodule.c	1998/12/04 18:49:55	2.18
--- newmodule.c	2000/02/29 13:59:23	2.19
***************
*** 46,50 ****
  	PyObject *dict;
  	PyInstanceObject *inst;
! 	if (!PyArg_ParseTuple(args, "O!O!",
  			      &PyClass_Type, &klass,
  			      &PyDict_Type, &dict))
--- 46,50 ----
  	PyObject *dict;
  	PyInstanceObject *inst;
! 	if (!PyArg_ParseTuple(args, "O!O!:instance",
  			      &PyClass_Type, &klass,
  			      &PyDict_Type, &dict))
***************
*** 72,76 ****
  	PyObject* classObj;
  
! 	if (!PyArg_ParseTuple(args, "OOO!",
  			      &func,
  			      &self,
--- 72,76 ----
  	PyObject* classObj;
  
! 	if (!PyArg_ParseTuple(args, "OOO!:instancemethod",
  			      &func,
  			      &self,
***************
*** 106,110 ****
  	PyFunctionObject* newfunc;
  
! 	if (!PyArg_ParseTuple(args, "O!O!|SO!",
  			      &PyCode_Type, &code,
  			      &PyDict_Type, &globals,
--- 106,110 ----
  	PyFunctionObject* newfunc;
  
! 	if (!PyArg_ParseTuple(args, "O!O!|SO!:function",
  			      &PyCode_Type, &code,
  			      &PyDict_Type, &globals,
***************
*** 153,157 ****
  	PyBufferProcs *pb;
  
! 	if (!PyArg_ParseTuple(args, "iiiiOO!O!O!SSiS",
  			      &argcount, &nlocals, &stacksize, &flags,
  			      &code,
--- 153,157 ----
  	PyBufferProcs *pb;
  
! 	if (!PyArg_ParseTuple(args, "iiiiOO!O!O!SSiS:code",
  			      &argcount, &nlocals, &stacksize, &flags,
  			      &code,
***************
*** 189,193 ****
  	char *name;
    
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	return PyModule_New(name);
--- 189,193 ----
  	char *name;
    
! 	if (!PyArg_ParseTuple(args, "s:module", &name))
  		return NULL;
  	return PyModule_New(name);
***************
*** 206,210 ****
  	PyObject * dict;
    
! 	if (!PyArg_ParseTuple(args, "SO!O!", &name, &PyTuple_Type, &classes,
  			      &PyDict_Type, &dict))
  		return NULL;
--- 206,210 ----
  	PyObject * dict;
    
! 	if (!PyArg_ParseTuple(args, "SO!O!:class", &name, &PyTuple_Type, &classes,
  			      &PyDict_Type, &dict))
  		return NULL;

Index: pcremodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/pcremodule.c,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -r2.16 -r2.17
*** pcremodule.c	2000/02/18 18:30:01	2.16
--- pcremodule.c	2000/02/29 13:59:23	2.17
***************
*** 110,114 ****
  	PyObject *list;
  
! 	if (!PyArg_ParseTuple(args, "t#|iiii", &string, &stringlen, &pos, &endpos, &options))
  		return NULL;
  	if (endpos == -1) {endpos = stringlen;}
--- 110,114 ----
  	PyObject *list;
  
! 	if (!PyArg_ParseTuple(args, "t#|iiii:match", &string, &stringlen, &pos, &endpos, &options))
  		return NULL;
  	if (endpos == -1) {endpos = stringlen;}
***************
*** 194,198 ****
  	
  	int options, erroroffset;
! 	if (!PyArg_ParseTuple(args, "siO!", &pattern, &options,
  			      &PyDict_Type, &dictionary))
  		return NULL;
--- 194,198 ----
  	
  	int options, erroroffset;
! 	if (!PyArg_ParseTuple(args, "siO!:pcre_compile", &pattern, &options,
  			      &PyDict_Type, &dictionary))
  		return NULL;
***************
*** 472,476 ****
  	int size, total_len, i, start, pos;
  
! 	if (!PyArg_ParseTuple(args, "OS", &match_obj, &repl_obj)) 
  		return NULL;
  
--- 472,476 ----
  	int size, total_len, i, start, pos;
  
! 	if (!PyArg_ParseTuple(args, "OS:pcre_expand", &match_obj, &repl_obj)) 
  		return NULL;
  

Index: puremodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/puremodule.c,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -r2.1 -r2.2
*** puremodule.c	1997/01/17 00:01:29	2.1
--- puremodule.c	2000/02/29 13:59:23	2.2
***************
*** 322,326 ****
  	int id;
  
! 	if (!PyArg_ParseTuple(args, "li", &memrep, &id))
  		return NULL;
  
--- 322,326 ----
  	int id;
  
! 	if (!PyArg_ParseTuple(args, "li:purify_set_pool_id", &memrep, &id))
  		return NULL;
  
***************
*** 344,348 ****
  	long datarep;
  
! 	if (!PyArg_ParseTuple(args, "ll", &memrep, &datarep))
  		return NULL;
  
--- 344,348 ----
  	long datarep;
  
! 	if (!PyArg_ParseTuple(args, "ll:purify_set_user_data", &memrep, &datarep))
  		return NULL;
  
***************
*** 362,366 ****
  	void* data;
  
! 	if (!PyArg_ParseTuple(args, "l", &memrep))
  		return NULL;
  
--- 362,366 ----
  	void* data;
  
! 	if (!PyArg_ParseTuple(args, "l:purify_get_user_data", &memrep))
  		return NULL;
  
***************
*** 412,416 ****
  	int id;
  
! 	if (!PyArg_ParseTuple(args, "iO", &id, &arg_callable))
  		return NULL;
  
--- 412,416 ----
  	int id;
  
! 	if (!PyArg_ParseTuple(args, "iO:purify_map_pool", &id, &arg_callable))
  		return NULL;
  
***************
*** 452,456 ****
  	PyObject* arg_callable;
  
! 	if (!PyArg_ParseTuple(args, "O", &arg_callable))
  		return NULL;
  
--- 452,456 ----
  	PyObject* arg_callable;
  
! 	if (!PyArg_ParseTuple(args, "O:purify_map_pool_id", &arg_callable))
  		return NULL;
  
***************
*** 531,535 ****
  	char* stringarg;
  
! 	if (!PyArg_ParseTuple(args, "s", &stringarg))
  		return NULL;
  
--- 531,535 ----
  	char* stringarg;
  
! 	if (!PyArg_ParseTuple(args, "s:purify_name_thread", &stringarg))
  		return NULL;
  
***************
*** 667,671 ****
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "lis", &addrrep, &size, &type))
  		return NULL;
  
--- 667,671 ----
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "lis:purify_watch_n", &addrrep, &size, &type))
  		return NULL;
  
***************
*** 690,694 ****
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "i", &watchno))
  		return NULL;
  
--- 690,694 ----
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "i:purify_watch_remove", &watchno))
  		return NULL;
  
***************
*** 712,716 ****
  	char* rtn;
  
! 	if (!PyArg_ParseTuple(args, "l", &addrrep))
  		return NULL;
  
--- 712,716 ----
  	char* rtn;
  
! 	if (!PyArg_ParseTuple(args, "l:purify_describe", &addrrep))
  		return NULL;
  
***************
*** 728,732 ****
  	int status;
      
! 	if (!PyArg_ParseTuple(args, "li", &addrrep, &size))
  		return NULL;
  
--- 728,732 ----
  	int status;
      
! 	if (!PyArg_ParseTuple(args, "li:purify_what_colors", &addrrep, &size))
  		return NULL;
  
***************
*** 773,777 ****
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "i", &status))
  		return NULL;
  
--- 773,777 ----
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "i:purify_exit", &status))
  		return NULL;
  

Index: readline.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/readline.c,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** readline.c	1999/11/18 17:51:02	2.15
--- readline.c	2000/02/29 13:59:23	2.16
***************
*** 51,55 ****
  {
  	char *s, *copy;
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	/* Make a copy -- rl_parse_and_bind() modifies its argument */
--- 51,55 ----
  {
  	char *s, *copy;
! 	if (!PyArg_ParseTuple(args, "s:parse_and_bind", &s))
  		return NULL;
  	/* Make a copy -- rl_parse_and_bind() modifies its argument */
***************
*** 79,83 ****
  {
  	char *s = NULL;
! 	if (!PyArg_ParseTuple(args, "|z", &s))
  		return NULL;
  	errno = rl_read_init_file(s);
--- 79,83 ----
  {
  	char *s = NULL;
! 	if (!PyArg_ParseTuple(args, "|z:read_init_file", &s))
  		return NULL;
  	errno = rl_read_init_file(s);
***************
*** 147,151 ****
  	char *break_chars;
  
! 	if(!PyArg_ParseTuple(args, "s", &break_chars)) {
  		return NULL;
  	}
--- 147,151 ----
  	char *break_chars;
  
! 	if(!PyArg_ParseTuple(args, "s:set_completer_delims", &break_chars)) {
  		return NULL;
  	}
***************
*** 184,188 ****
  {
  	PyObject *function = Py_None;
! 	if (!PyArg_ParseTuple(args, "|O", &function))
  		return NULL;
  	if (function == Py_None) {
--- 184,188 ----
  {
  	PyObject *function = Py_None;
! 	if (!PyArg_ParseTuple(args, "|O:set_completer", &function))
  		return NULL;
  	if (function == Py_None) {
***************
*** 240,244 ****
  {
  	char *s;
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	rl_insert_text(s);
--- 240,244 ----
  {
  	char *s;
! 	if (!PyArg_ParseTuple(args, "s:insert_text", &s))
  		return NULL;
  	rl_insert_text(s);

Index: regexmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/regexmodule.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** regexmodule.c	1998/12/04 18:50:02	1.32
--- regexmodule.c	2000/02/29 13:59:23	1.33
***************
*** 120,124 ****
  	int result;
  
! 	if (!PyArg_ParseTuple(args, "O|i", &argstring, &offset))
  		return NULL;
  	if (!PyArg_Parse(argstring, "t#", &buffer, &size))
--- 120,124 ----
  	int result;
  
! 	if (!PyArg_ParseTuple(args, "O|i:match", &argstring, &offset))
  		return NULL;
  	if (!PyArg_Parse(argstring, "t#", &buffer, &size))
***************
*** 159,165 ****
  	int result;
  	
! 	if (!PyArg_ParseTuple(args, "O|i", &argstring, &offset))
  		return NULL;
! 	if (!PyArg_Parse(argstring, "t#", &buffer, &size))
  		return NULL;
  
--- 159,165 ----
  	int result;
  	
! 	if (!PyArg_ParseTuple(args, "O|i:search", &argstring, &offset))
  		return NULL;
! 	if (!PyArg_Parse(argstring, "t#:search", &buffer, &size))
  		return NULL;
  
***************
*** 460,464 ****
  	PyObject *tran = NULL;
  
! 	if (!PyArg_ParseTuple(args, "S|S", &pat, &tran))
  		return NULL;
  	return newregexobject(pat, tran, pat, NULL);
--- 460,464 ----
  	PyObject *tran = NULL;
  
! 	if (!PyArg_ParseTuple(args, "S|S:compile", &pat, &tran))
  		return NULL;
  	return newregexobject(pat, tran, pat, NULL);
***************
*** 585,589 ****
  	PyObject *retval = NULL;
  
! 	if (!PyArg_ParseTuple(args, "S|S", &pattern, &tran))
  		return NULL;
  
--- 585,589 ----
  	PyObject *retval = NULL;
  
! 	if (!PyArg_ParseTuple(args, "S|S:symcomp", &pattern, &tran))
  		return NULL;
  

Index: resource.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/resource.c,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** resource.c	1999/01/06 18:44:57	2.9
--- resource.c	2000/02/29 13:59:23	2.10
***************
*** 61,65 ****
  	struct rusage ru;
  
! 	if (!PyArg_ParseTuple(args, "i", &who))
  		return NULL;
  
--- 61,65 ----
  	struct rusage ru;
  
! 	if (!PyArg_ParseTuple(args, "i:getrusage", &who))
  		return NULL;
  
***************
*** 108,112 ****
  	int resource;
  
! 	if (!PyArg_ParseTuple(args, "i", &resource)) 
  		return NULL;
  
--- 108,112 ----
  	int resource;
  
! 	if (!PyArg_ParseTuple(args, "i:getrlimit", &resource)) 
  		return NULL;
  
***************
*** 141,145 ****
  	PyObject *curobj, *maxobj;
  
! 	if (!PyArg_ParseTuple(args, "i(OO)", &resource, &curobj, &maxobj))
  		return NULL;
  
--- 141,145 ----
  	PyObject *curobj, *maxobj;
  
! 	if (!PyArg_ParseTuple(args, "i(OO):setrlimit", &resource, &curobj, &maxobj))
  		return NULL;
  
***************
*** 183,187 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	return Py_BuildValue("i", getpagesize());
--- 183,187 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":getpagesize"))
  		return NULL;
  	return Py_BuildValue("i", getpagesize());

Index: rotormodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/rotormodule.c,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -r2.21 -r2.22
*** rotormodule.c	1998/12/04 18:50:04	2.21
--- rotormodule.c	2000/02/29 13:59:23	2.22
***************
*** 584,588 ****
  	char *key;
  
! 	if (!PyArg_ParseTuple(args, "s", &key))
  		return NULL;
  
--- 584,588 ----
  	char *key;
  
! 	if (!PyArg_ParseTuple(args, "s:setkey", &key))
  		return NULL;
  
***************
*** 640,644 ****
  	int num_rotors = 6;
  
! 	if (!PyArg_ParseTuple(args, "s#|i", &string, &len, &num_rotors))
  		return NULL;
  
--- 640,644 ----
  	int num_rotors = 6;
  
! 	if (!PyArg_ParseTuple(args, "s#|i:newrotor", &string, &len, &num_rotors))
  		return NULL;
  

Index: selectmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/selectmodule.c,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -r2.30 -r2.31
*** selectmodule.c	2000/01/14 16:33:09	2.30
--- selectmodule.c	2000/02/29 13:59:23	2.31
***************
*** 244,248 ****
  
  	/* convert arguments */
! 	if (!PyArg_ParseTuple(args, "OOO|O",
  			      &ifdlist, &ofdlist, &efdlist, &tout))
  		return NULL;
--- 244,248 ----
  
  	/* convert arguments */
! 	if (!PyArg_ParseTuple(args, "OOO|O:select",
  			      &ifdlist, &ofdlist, &efdlist, &tout))
  		return NULL;

Index: shamodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/shamodule.c,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -r2.3 -r2.4
*** shamodule.c	1999/04/10 15:46:58	2.3
--- shamodule.c	2000/02/29 13:59:23	2.4
***************
*** 549,553 ****
  		return NULL;
  
! 	if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|s#", kwlist,
  					 &cp, &len)) {
  	        Py_DECREF(new);
--- 549,553 ----
  		return NULL;
  
! 	if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|s#:new", kwlist,
  					 &cp, &len)) {
  	        Py_DECREF(new);

Index: socketmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** socketmodule.c	1999/12/07 21:30:30	1.95
--- socketmodule.c	2000/02/29 13:59:23	1.96
***************
*** 1097,1101 ****
  	PyObject *f;
  
! 	if (!PyArg_ParseTuple(args, "|si", &mode, &bufsize))
  		return NULL;
  #ifdef MS_WIN32
--- 1097,1101 ----
  	PyObject *f;
  
! 	if (!PyArg_ParseTuple(args, "|si:makefile", &mode, &bufsize))
  		return NULL;
  #ifdef MS_WIN32
***************
*** 1132,1136 ****
  	int len, n, flags = 0;
  	PyObject *buf;
! 	if (!PyArg_ParseTuple(args, "i|i", &len, &flags))
  		return NULL;
  	buf = PyString_FromStringAndSize((char *) 0, len);
--- 1132,1136 ----
  	int len, n, flags = 0;
  	PyObject *buf;
! 	if (!PyArg_ParseTuple(args, "i|i:recv", &len, &flags))
  		return NULL;
  	buf = PyString_FromStringAndSize((char *) 0, len);
***************
*** 1169,1173 ****
  
  	int addrlen, len, n, flags = 0;
! 	if (!PyArg_ParseTuple(args, "i|i", &len, &flags))
  		return NULL;
  	if (!getsockaddrlen(s, &addrlen))
--- 1169,1173 ----
  
  	int addrlen, len, n, flags = 0;
! 	if (!PyArg_ParseTuple(args, "i|i:recvfrom", &len, &flags))
  		return NULL;
  	if (!getsockaddrlen(s, &addrlen))
***************
*** 1219,1223 ****
  	char *buf;
  	int len, n, flags = 0;
! 	if (!PyArg_ParseTuple(args, "s#|i", &buf, &len, &flags))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
--- 1219,1223 ----
  	char *buf;
  	int len, n, flags = 0;
! 	if (!PyArg_ParseTuple(args, "s#|i:send", &buf, &len, &flags))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
***************
*** 1703,1707 ****
  #endif
  	int family, type, proto = 0;
! 	if (!PyArg_ParseTuple(args, "ii|i", &family, &type, &proto))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
--- 1703,1707 ----
  #endif
  	int family, type, proto = 0;
! 	if (!PyArg_ParseTuple(args, "ii|i:socket", &family, &type, &proto))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
***************
*** 1748,1752 ****
  	PySocketSockObject *s;
  	int fd, family, type, proto = 0;
! 	if (!PyArg_ParseTuple(args, "iii|i", &fd, &family, &type, &proto))
  		return NULL;
  	/* Dup the fd so it and the socket can be closed independently */
--- 1748,1752 ----
  	PySocketSockObject *s;
  	int fd, family, type, proto = 0;
! 	if (!PyArg_ParseTuple(args, "iii|i:fromfd", &fd, &family, &type, &proto))
  		return NULL;
  	/* Dup the fd so it and the socket can be closed independently */
***************
*** 2016,2020 ****
  	char *cert_file;
    
! 	if (!PyArg_ParseTuple(args, "O!zz",
  			      &PySocketSock_Type, (PyObject*)&Sock,
  			      &key_file, &cert_file) )
--- 2016,2020 ----
  	char *cert_file;
    
! 	if (!PyArg_ParseTuple(args, "O!zz:ssl",
  			      &PySocketSock_Type, (PyObject*)&Sock,
  			      &key_file, &cert_file) )
***************
*** 2095,2099 ****
  	int len = 0;
    
! 	if (!PyArg_ParseTuple(args, "s|i", &data, &len))
  		return NULL;
    
--- 2095,2099 ----
  	int len = 0;
    
! 	if (!PyArg_ParseTuple(args, "s|i:write", &data, &len))
  		return NULL;
    
***************
*** 2112,2116 ****
  	int res;
    
! 	PyArg_ParseTuple(args, "|i", &len);
    
  	if (!(buf = PyString_FromStringAndSize((char *) 0, len)))
--- 2112,2116 ----
  	int res;
    
! 	PyArg_ParseTuple(args, "|i:read", &len);
    
  	if (!(buf = PyString_FromStringAndSize((char *) 0, len)))

Index: soundex.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/soundex.c,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -r2.6 -r2.7
*** soundex.c	1998/12/04 18:50:08	2.6
--- soundex.c	2000/02/29 13:59:24	2.7
***************
*** 126,130 ****
  	char sdx[7];
  
! 	if(!PyArg_ParseTuple( args, "s", &str))
  	  return NULL;
  
--- 126,130 ----
  	char sdx[7];
  
! 	if(!PyArg_ParseTuple( args, "s:get_soundex", &str))
  	  return NULL;
  
***************
*** 142,146 ****
      char res1[7], res2[7];
      
!     if(!PyArg_ParseTuple(args, "ss", &str1, &str2))
          return NULL;
  
--- 142,146 ----
      char res1[7], res2[7];
      
!     if(!PyArg_ParseTuple(args, "ss:sound_similar", &str1, &str2))
          return NULL;
  

Index: stropmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/stropmodule.c,v
retrieving revision 2.60
retrieving revision 2.61
diff -C2 -r2.60 -r2.61
*** stropmodule.c	1999/11/04 19:19:48	2.60
--- stropmodule.c	2000/02/29 13:59:24	2.61
***************
*** 142,146 ****
  	splitcount = 0;
  	maxsplit = 0;
! 	if (!PyArg_ParseTuple(args, "t#|z#i", &s, &len, &sub, &n, &maxsplit))
  		return NULL;
  	if (sub == NULL)
--- 142,146 ----
  	splitcount = 0;
  	maxsplit = 0;
! 	if (!PyArg_ParseTuple(args, "t#|z#i:split", &s, &len, &sub, &n, &maxsplit))
  		return NULL;
  	if (sub == NULL)
***************
*** 212,216 ****
  	intargfunc getitemfunc;
  
! 	if (!PyArg_ParseTuple(args, "O|t#", &seq, &sep, &seplen))
  		return NULL;
  	if (sep == NULL) {
--- 212,216 ----
  	intargfunc getitemfunc;
  
! 	if (!PyArg_ParseTuple(args, "O|t#:join", &seq, &sep, &seplen))
  		return NULL;
  	if (sep == NULL) {
***************
*** 339,343 ****
  	int len, n, i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  
--- 339,343 ----
  	int len, n, i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii:find", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  
***************
*** 384,388 ****
  	int i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  
--- 384,388 ----
  	int i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii:rfind", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  
***************
*** 643,647 ****
  
  	/* Get arguments */
! 	if (!PyArg_ParseTuple(args, "s#|i", &string, &stringlen, &tabsize))
  		return NULL;
  	if (tabsize < 1) {
--- 643,647 ----
  
  	/* Get arguments */
! 	if (!PyArg_ParseTuple(args, "s#|i:expandtabs", &string, &stringlen, &tabsize))
  		return NULL;
  	if (tabsize < 1) {
***************
*** 709,713 ****
  	int m, r;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  	if (last > len)
--- 709,713 ----
  	int m, r;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii:count", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  	if (last > len)
***************
*** 804,808 ****
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s|i", &s, &base))
  		return NULL;
  
--- 804,808 ----
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s|i:atoi", &s, &base))
  		return NULL;
  
***************
*** 859,863 ****
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s|i", &s, &base))
  		return NULL;
  
--- 859,863 ----
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s|i:atol", &s, &base))
  		return NULL;
  
***************
*** 905,909 ****
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	while (*s && isspace(Py_CHARMASK(*s)))
--- 905,909 ----
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s:atof", &s))
  		return NULL;
  	while (*s && isspace(Py_CHARMASK(*s)))
***************
*** 949,953 ****
  	PyObject *result;
  
! 	if (!PyArg_ParseTuple(args, "t#t#", &from, &fromlen, &to, &tolen))
  		return NULL;
  
--- 949,953 ----
  	PyObject *result;
  
! 	if (!PyArg_ParseTuple(args, "t#t#:maketrans", &from, &fromlen, &to, &tolen))
  		return NULL;
  
***************
*** 992,996 ****
  	int trans_table[256];
  
! 	if (!PyArg_ParseTuple(args, "St#|t#", &input_obj,
  			      &table1, &tablen, &del_table, &dellen))
  		return NULL;
--- 992,996 ----
  	int trans_table[256];
  
! 	if (!PyArg_ParseTuple(args, "St#|t#:translate", &input_obj,
  			      &table1, &tablen, &del_table, &dellen))
  		return NULL;
***************
*** 1206,1210 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, "t#t#t#|i",
  			      &str, &len, &pat, &pat_len, &sub, &sub_len,
  			      &count))
--- 1206,1210 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, "t#t#t#|i:replace",
  			      &str, &len, &pat, &pat_len, &sub, &sub_len,
  			      &count))

Index: structmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/structmodule.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** structmodule.c	1998/12/04 18:50:11	2.29
--- structmodule.c	2000/02/29 13:59:24	2.30
***************
*** 1098,1102 ****
  	int size;
  
! 	if (!PyArg_ParseTuple(args, "s", &fmt))
  		return NULL;
  	f = whichtable(&fmt);
--- 1098,1102 ----
  	int size;
  
! 	if (!PyArg_ParseTuple(args, "s:calcsize", &fmt))
  		return NULL;
  	f = whichtable(&fmt);
***************
*** 1263,1267 ****
  	PyObject *res, *v;
  
! 	if (!PyArg_ParseTuple(args, "ss#", &fmt, &start, &len))
  		return NULL;
  	f = whichtable(&fmt);
--- 1263,1267 ----
  	PyObject *res, *v;
  
! 	if (!PyArg_ParseTuple(args, "ss#:unpack", &fmt, &start, &len))
  		return NULL;
  	f = whichtable(&fmt);

Index: syslogmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/syslogmodule.c,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** syslogmodule.c	1998/12/04 18:50:12	2.12
--- syslogmodule.c	2000/02/29 13:59:24	2.13
***************
*** 106,110 ****
  	PyObject * args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	closelog();
--- 106,110 ----
  	PyObject * args;
  {
! 	if (!PyArg_ParseTuple(args, ":closelog"))
  		return NULL;
  	closelog();
***************
*** 135,139 ****
  	long mask;
  	long pri;
! 	if (!PyArg_ParseTuple(args, "l", &pri))
  		return NULL;
  	mask = LOG_MASK(pri);
--- 135,139 ----
  	long mask;
  	long pri;
! 	if (!PyArg_ParseTuple(args, "l:LOG_MASK", &pri))
  		return NULL;
  	mask = LOG_MASK(pri);
***************
*** 148,152 ****
  	long mask;
  	long pri;
! 	if (!PyArg_ParseTuple(args, "l", &pri))
  		return NULL;
  	mask = LOG_UPTO(pri);
--- 148,152 ----
  	long mask;
  	long pri;
! 	if (!PyArg_ParseTuple(args, "l:LOG_UPTO", &pri))
  		return NULL;
  	mask = LOG_UPTO(pri);

Index: threadmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/threadmodule.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** threadmodule.c	1998/12/21 19:32:43	2.29
--- threadmodule.c	2000/02/29 13:59:24	2.30
***************
*** 252,256 ****
  	struct bootstate *boot;
  
! 	if (!PyArg_ParseTuple(fargs, "OO|O", &func, &args, &keyw))
  		return NULL;
  	if (!PyCallable_Check(func)) {
--- 252,256 ----
  	struct bootstate *boot;
  
! 	if (!PyArg_ParseTuple(fargs, "OO|O:start_new_thread", &func, &args, &keyw))
  		return NULL;
  	if (!PyCallable_Check(func)) {

Index: timemodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.78
retrieving revision 2.79
diff -C2 -r2.78 -r2.79
*** timemodule.c	2000/01/12 16:38:20	2.78
--- timemodule.c	2000/02/29 13:59:24	2.79
***************
*** 374,378 ****
  	memset((ANY *) &buf, '\0', sizeof(buf));
  
! 	if (!PyArg_ParseTuple(args, "sO", &fmt, &tup) || !gettmarg(tup, &buf))
  		return NULL;
  	fmtlen = strlen(fmt);
--- 374,378 ----
  	memset((ANY *) &buf, '\0', sizeof(buf));
  
! 	if (!PyArg_ParseTuple(args, "sO:strftime", &fmt, &tup) || !gettmarg(tup, &buf))
  		return NULL;
  	fmtlen = strlen(fmt);
***************
*** 422,426 ****
  	char *s;
  
! 	if (!PyArg_ParseTuple(args, "s|s", &buf, &fmt)) {
  		PyErr_SetString(PyExc_ValueError, "invalid argument");
  		return NULL;
--- 422,426 ----
  	char *s;
  
! 	if (!PyArg_ParseTuple(args, "s|s:strptime", &buf, &fmt)) {
  		PyErr_SetString(PyExc_ValueError, "invalid argument");
  		return NULL;
***************
*** 456,460 ****
  	struct tm buf;
  	char *p;
! 	if (!PyArg_ParseTuple(args, "O", &tup))
  		return NULL;
  	if (!gettmarg(tup, &buf))
--- 456,460 ----
  	struct tm buf;
  	char *p;
! 	if (!PyArg_ParseTuple(args, "O:asctime", &tup))
  		return NULL;
  	if (!gettmarg(tup, &buf))
***************
*** 507,511 ****
  	struct tm buf;
  	time_t tt;
! 	if (!PyArg_ParseTuple(args, "O", &tup))
  		return NULL;
  	tt = time(&tt);
--- 507,511 ----
  	struct tm buf;
  	time_t tt;
! 	if (!PyArg_ParseTuple(args, "O:mktime", &tup))
  		return NULL;
  	tt = time(&tt);

Index: xxmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/xxmodule.c,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** xxmodule.c	1999/02/16 22:15:42	2.14
--- xxmodule.c	2000/02/29 13:59:24	2.15
***************
*** 85,89 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	Py_INCREF(Py_None);
--- 85,89 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":demo"))
  		return NULL;
  	Py_INCREF(Py_None);
***************
*** 164,168 ****
  	long i, j;
  	long res;
! 	if (!PyArg_ParseTuple(args, "ll", &i, &j))
  		return NULL;
  	res = i+j; /* XXX Do something here */
--- 164,168 ----
  	long i, j;
  	long res;
! 	if (!PyArg_ParseTuple(args, "ll:foo", &i, &j))
  		return NULL;
  	res = i+j; /* XXX Do something here */
***************
*** 180,184 ****
  	XxoObject *rv;
  	
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	rv = newXxoObject(args);
--- 180,184 ----
  	XxoObject *rv;
  	
! 	if (!PyArg_ParseTuple(args, ":new"))
  		return NULL;
  	rv = newXxoObject(args);
***************
*** 197,201 ****
  	PyObject *list, *item;
  	
! 	if (!PyArg_ParseTuple(args, "O", &list))
  		return NULL;
  	
--- 197,201 ----
  	PyObject *list, *item;
  	
! 	if (!PyArg_ParseTuple(args, "O:bug", &list))
  		return NULL;
  	
***************
*** 220,224 ****
  	PyObject *a;
  	long b;
! 	if (!PyArg_ParseTuple(args, "O#", &a, &b))
  		return NULL;
  	Py_INCREF(Py_None);
--- 220,224 ----
  	PyObject *a;
  	long b;
! 	if (!PyArg_ParseTuple(args, "O#:roj", &a, &b))
  		return NULL;
  	Py_INCREF(Py_None);

Index: zlibmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/zlibmodule.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** zlibmodule.c	1999/12/22 16:13:54	2.29
--- zlibmodule.c	2000/02/29 13:59:24	2.30
***************
*** 75,79 ****
    z_stream zst;
    
!   if (!PyArg_ParseTuple(args, "s#|i", &input, &length, &level))
      return NULL;
    zst.avail_out = length + length/1000 + 12 + 1;
--- 75,79 ----
    z_stream zst;
    
!   if (!PyArg_ParseTuple(args, "s#|i:compress", &input, &length, &level))
      return NULL;
    zst.avail_out = length + length/1000 + 12 + 1;
***************
*** 173,177 ****
    int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC;
    z_stream zst;
!   if (!PyArg_ParseTuple(args, "s#|ii", &input, &length, &wsize, &r_strlen))
      return NULL;
  
--- 173,177 ----
    int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC;
    z_stream zst;
!   if (!PyArg_ParseTuple(args, "s#|ii:decompress", &input, &length, &wsize, &r_strlen))
      return NULL;
  
***************
*** 279,283 ****
    int wbits=MAX_WBITS, memLevel=DEF_MEM_LEVEL, strategy=0, err;
  
!   if (!PyArg_ParseTuple(args, "|iiiii", &level, &method, &wbits,
  			&memLevel, &strategy))
        return NULL;
--- 279,283 ----
    int wbits=MAX_WBITS, memLevel=DEF_MEM_LEVEL, strategy=0, err;
  
!   if (!PyArg_ParseTuple(args, "|iiiii:compressobj", &level, &method, &wbits,
  			&memLevel, &strategy))
        return NULL;
***************
*** 326,330 ****
    int wbits=DEF_WBITS, err;
    compobject *self;
!   if (!PyArg_ParseTuple(args, "|i", &wbits))
      {
       return NULL;
--- 326,330 ----
    int wbits=DEF_WBITS, err;
    compobject *self;
!   if (!PyArg_ParseTuple(args, "|i:decompressobj", &wbits))
      {
       return NULL;
***************
*** 404,408 ****
    unsigned long start_total_out;
    
!   if (!PyArg_ParseTuple(args, "s#", &input, &inplen))
        return NULL;
    self->zst.avail_in = inplen;
--- 404,408 ----
    unsigned long start_total_out;
    
!   if (!PyArg_ParseTuple(args, "s#:compress", &input, &inplen))
        return NULL;
    self->zst.avail_in = inplen;
***************
*** 462,466 ****
    unsigned long start_total_out;
  
!   if (!PyArg_ParseTuple(args, "s#", &input, &inplen))
      return NULL;
    start_total_out = self->zst.total_out;
--- 462,466 ----
    unsigned long start_total_out;
  
!   if (!PyArg_ParseTuple(args, "s#:decompress", &input, &inplen))
      return NULL;
    start_total_out = self->zst.total_out;
***************
*** 536,540 ****
    unsigned long start_total_out;
  
!   if (!PyArg_ParseTuple(args, "|i", &flushmode))
        return NULL;
  
--- 536,540 ----
    unsigned long start_total_out;
  
!   if (!PyArg_ParseTuple(args, "|i:flush", &flushmode))
        return NULL;
  
***************
*** 746,750 ****
      int len;
   
!     if (!PyArg_ParseTuple(args, "s#|l", &buf, &len, &adler32val))
      {
  	return NULL;
--- 746,750 ----
      int len;
   
!     if (!PyArg_ParseTuple(args, "s#|l:adler32", &buf, &len, &adler32val))
      {
  	return NULL;
***************
*** 768,772 ****
      Byte *buf;
      int len;
!     if (!PyArg_ParseTuple(args, "s#|l", &buf, &len, &crc32val))
      {
  	return NULL;
--- 768,772 ----
      Byte *buf;
      int len;
!     if (!PyArg_ParseTuple(args, "s#|l:crc32", &buf, &len, &crc32val))
      {
  	return NULL;



From fdrake@acm.org  Tue Feb 29 14:52:46 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 29 Feb 2000 09:52:46 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src Makefile.in,1.82,1.83
In-Reply-To: <200002291338.IAA04782@eric.cnri.reston.va.us>
References: <m12Ph1W-000CnCC@artcom0.artcom-gmbh.de>
 <200002291338.IAA04782@eric.cnri.reston.va.us>
Message-ID: <14523.56638.286603.340358@weyr.cnri.reston.va.us>

Guido van Rossum writes:
 > You can already extract this from the updated documetation on the
 > website (which has a list of obsolete modules).
 > 
 > But you're righ,t it would be good to be open about this.  I'll think
 > about it.

  Note that the updated documentation isn't yet "published"; there are 
no links to it and it hasn't been checked as much as I need it to be
before announcing it.
  Also, a separate announcement posted to the lists will reach more
people than the "Obsolete" section of the "Undocumented Modules"
chapter in the library reference.


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From fdrake@weyr.cnri.reston.va.us  Tue Feb 29 15:46:28 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 29 Feb 2000 10:46:28 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc README,1.36,1.36.4.1
Message-ID: <200002291546.KAA28496@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p2

Modified Files:
      Tag: release152p1-patches
	README 
Log Message:

Note that really new versions of LaTeX2HTML don't work for us.  ;(


Index: README
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/README,v
retrieving revision 1.36
retrieving revision 1.36.4.1
diff -C2 -r1.36 -r1.36.4.1
*** README	1999/03/03 21:44:10	1.36
--- README	2000/02/29 15:46:25	1.36.4.1
***************
*** 131,134 ****
--- 131,136 ----
  	  up code fragments.  ;-(  Releases are available at:
  	  <http://cdc-server.cdc.informatik.tu-darmstadt.de/~latex2html/>.
+ 	  Really new versions also don't work, but I'm not sure when
+ 	  things broke.
  
  



From guido@cnri.reston.va.us  Tue Feb 29 15:52:43 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 10:52:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules Setup.in,1.89,1.90 nismodule.c,2.14,2.15
Message-ID: <200002291552.KAA06607@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/src/Modules

Modified Files:
	Setup.in nismodule.c 
Log Message:
Patch by Fred Gansevles (the module's original author).

This patch fixes 3 small problems.
1) If a map is used which is generated with 'makedbm -a',
   the trailing '\0' is now handled correctely.
2) The nis.maps() function skipped the first map in the output list.
3) The library '-lnsl' is added in Setup.in (needed on Linux glibc2 and
   Solaris systems. Maybe on other systems too?)

[I note that this still doesn't work when you are using NIS+ --GvR]


Index: Setup.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/Setup.in,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -r1.89 -r1.90
*** Setup.in	1999/12/07 21:47:09	1.89
--- Setup.in	2000/02/29 15:52:40	1.90
***************
*** 165,169 ****
  # are not supported by all UNIX systems:
  
! #nis nismodule.c 	# Sun yellow pages -- not everywhere
  #termios termios.c	# Steen Lumholt's termios module
  #resource resource.c	# Jeremy Hylton's rlimit interface
--- 165,169 ----
  # are not supported by all UNIX systems:
  
! #nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
  #termios termios.c	# Steen Lumholt's termios module
  #resource resource.c	# Jeremy Hylton's rlimit interface

Index: nismodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/nismodule.c,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** nismodule.c	1998/10/08 02:25:18	2.14
--- nismodule.c	2000/02/29 15:52:40	2.15
***************
*** 2,6 ****
      Written by:
  	Fred Gansevles <Fred.Gansevles@cs.utwente.nl>
! 	Vakgroep Spa,
  	Faculteit der Informatica,
  	Universiteit Twente,
--- 2,6 ----
      Written by:
  	Fred Gansevles <Fred.Gansevles@cs.utwente.nl>
! 	B&O group,
  	Faculteit der Informatica,
  	Universiteit Twente,
***************
*** 37,61 ****
  	char *alias;
  	char *map;
  } aliases [] = {
! 	{"passwd",	"passwd.byname"},
! 	{"group",	"group.byname"},
! 	{"networks",	"networks.byaddr"},
! 	{"hosts",	"hosts.byname"},
! 	{"protocols",	"protocols.bynumber"},
! 	{"services",	"services.byname"},
! 	{"aliases",	"mail.aliases"},
! 	{"ethers",	"ethers.byname"},
! 	{0L,		0L}
  };
  
  static char *
! nis_mapname (map)
  	char *map;
  {
  	int i;
  
! 	for (i=0; aliases[i].alias != 0L; i++)
! 		if (!strcmp (aliases[i].alias, map))
! 			map = aliases[i].map;
  	return map;
  }
--- 37,72 ----
  	char *alias;
  	char *map;
+ 	int  fix;
  } aliases [] = {
! 	{"passwd",	"passwd.byname",	0},
! 	{"group",	"group.byname",		0},
! 	{"networks",	"networks.byaddr",	0},
! 	{"hosts",	"hosts.byname",		0},
! 	{"protocols",	"protocols.bynumber",	0},
! 	{"services",	"services.byname",	0},
! 	{"aliases",	"mail.aliases",		1}, /* created with 'makedbm -a' */
! 	{"ethers",	"ethers.byname",	0},
! 	{0L,		0L,			0}
  };
  
  static char *
! nis_mapname (map, pfix)
  	char *map;
+ 	int *pfix;
  {
  	int i;
  
! 	*pfix = 0;
! 	for (i=0; aliases[i].alias != 0L; i++) {
! 		if (!strcmp (aliases[i].alias, map)) {
! 			*pfix = aliases[i].fix;
! 			return aliases[i].map;
! 		}
! 		if (!strcmp (aliases[i].map, map)) {
! 			*pfix = aliases[i].fix;
! 			return aliases[i].map;
! 		}
! 	}
! 
  	return map;
  }
***************
*** 63,66 ****
--- 74,82 ----
  typedef int (*foreachfunc) Py_PROTO((int, char *, int, char *, int, char *));
  
+ struct ypcallback_data {
+ 	PyObject	*dict;
+ 	int			fix;
+ };
+ 
  static int
  nis_foreach (instatus, inkey, inkeylen, inval, invallen, indata)
***************
*** 70,79 ****
  	char *inval;
  	int invallen;
! 	PyObject *indata;
  {
  	if (instatus == YP_TRUE) {
! 		PyObject *key = PyString_FromStringAndSize(inkey, inkeylen);
! 		PyObject *val = PyString_FromStringAndSize(inval, invallen);
  		int err;
  		if (key == NULL || val == NULL) {
  			/* XXX error -- don't know how to handle */
--- 86,102 ----
  	char *inval;
  	int invallen;
! 	struct ypcallback_data *indata;
  {
  	if (instatus == YP_TRUE) {
! 		PyObject *key;
! 		PyObject *val;
  		int err;
+ 
+ 		if (indata->fix) {
+ 		    inkeylen--;
+ 		    invallen--;
+ 		}
+ 		key = PyString_FromStringAndSize(inkey, inkeylen);
+ 		val = PyString_FromStringAndSize(inval, invallen);
  		if (key == NULL || val == NULL) {
  			/* XXX error -- don't know how to handle */
***************
*** 83,87 ****
  			return 1;
  		}
! 		err = PyDict_SetItem(indata, key, val);
  		Py_DECREF(key);
  		Py_DECREF(val);
--- 106,110 ----
  			return 1;
  		}
! 		err = PyDict_SetItem(indata->dict, key, val);
  		Py_DECREF(key);
  		Py_DECREF(val);
***************
*** 106,109 ****
--- 129,133 ----
  	int err;
  	PyObject *res;
+ 	int fix;
  
  	if (!PyArg_Parse(args, "(t#s)", &key, &keylen, &map))
***************
*** 111,118 ****
  	if ((err = yp_get_default_domain(&domain)) != 0)
  		return nis_error(err);
  	Py_BEGIN_ALLOW_THREADS
- 	map = nis_mapname (map);
  	err = yp_match (domain, map, key, keylen, &match, &len);
  	Py_END_ALLOW_THREADS
  	if (err != 0)
  		return nis_error(err);
--- 135,146 ----
  	if ((err = yp_get_default_domain(&domain)) != 0)
  		return nis_error(err);
+ 	map = nis_mapname (map, &fix);
+ 	if (fix)
+ 	    keylen++;
  	Py_BEGIN_ALLOW_THREADS
  	err = yp_match (domain, map, key, keylen, &match, &len);
  	Py_END_ALLOW_THREADS
+ 	if (fix)
+ 	    len--;
  	if (err != 0)
  		return nis_error(err);
***************
*** 130,134 ****
  	char *map;
  	struct ypall_callback cb;
! 	PyObject *cat;
  	int err;
  
--- 158,163 ----
  	char *map;
  	struct ypall_callback cb;
! 	struct ypcallback_data data;
! 	PyObject *dict;
  	int err;
  
***************
*** 137,154 ****
  	if ((err = yp_get_default_domain(&domain)) != 0)
  		return nis_error(err);
! 	cat = PyDict_New ();
! 	if (cat == NULL)
  		return NULL;
  	cb.foreach = (foreachfunc)nis_foreach;
! 	cb.data = (char *)cat;
  	Py_BEGIN_ALLOW_THREADS
- 	map = nis_mapname (map);
  	err = yp_all (domain, map, &cb);
  	Py_END_ALLOW_THREADS
  	if (err != 0) {
! 		Py_DECREF(cat);
  		return nis_error(err);
  	}
! 	return cat;
  }
  
--- 166,184 ----
  	if ((err = yp_get_default_domain(&domain)) != 0)
  		return nis_error(err);
! 	dict = PyDict_New ();
! 	if (dict == NULL)
  		return NULL;
  	cb.foreach = (foreachfunc)nis_foreach;
! 	data.dict = dict;
! 	map = nis_mapname (map, &data.fix);
! 	cb.data = (char *)&data;
  	Py_BEGIN_ALLOW_THREADS
  	err = yp_all (domain, map, &cb);
  	Py_END_ALLOW_THREADS
  	if (err != 0) {
! 		Py_DECREF(dict);
  		return nis_error(err);
  	}
! 	return dict;
  }
  
***************
*** 346,350 ****
  	if ((list = PyList_New(0)) == NULL)
  		return NULL;
! 	for (maps = maps->next; maps; maps = maps->next) {
  		PyObject *str = PyString_FromString(maps->map);
  		if (!str || PyList_Append(list, str) < 0)
--- 376,380 ----
  	if ((list = PyList_New(0)) == NULL)
  		return NULL;
! 	for (maps = maps; maps; maps = maps->next) {
  		PyObject *str = PyString_FromString(maps->map);
  		if (!str || PyList_Append(list, str) < 0)



From fdrake@weyr.cnri.reston.va.us  Tue Feb 29 15:53:06 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 29 Feb 2000 10:53:06 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.12,1.56.2.13
Message-ID: <200002291553.KAA28600@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p2/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Documentation for the memory management APIs, from Vladimir Marangozov
<marangoz@python.inrialpes.fr>.


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.12
retrieving revision 1.56.2.13
diff -C2 -r1.56.2.12 -r1.56.2.13
*** api.tex	2000/02/21 18:10:09	1.56.2.12
--- api.tex	2000/02/29 15:53:03	1.56.2.13
***************
*** 709,717 ****
  well as the global variable \cdata{_Py_RefTotal}.
  
- XXX Should mention Py_Malloc(), Py_Realloc(), Py_Free(),
- PyMem_Malloc(), PyMem_Realloc(), PyMem_Free(), PyMem_NEW(),
- PyMem_RESIZE(), PyMem_DEL(), PyMem_XDEL().
  
- 
  \chapter{Exception Handling \label{exceptionHandling}}
  
--- 709,713 ----
***************
*** 3248,3251 ****
--- 3244,3462 ----
  must be held.
  \end{cfuncdesc}
+ 
+ 
+ \chapter{Memory Management \label{memory}}
+ 
+ \section{Overview \label{memoryOverview}}
+ 
+ Memory management in Python involves a private heap containing all
+ Python objects and data structures. The management of this private
+ heap is ensured internally by the \emph{Python memory manager}.  The
+ Python memory manager has different components which deal with various
+ dynamic storage management aspects, like sharing, segmentation,
+ preallocation or caching.
+ 
+ At the lowest level, a raw memory allocator ensures that there is
+ enough room in the private heap for storing all Python-related data,
+ by interacting with the memory manager of the operating system. On top
+ of the raw memory allocator, several object-specific allocators
+ operate on the same heap and implement distinct memory management
+ policies adapted to the peculiarities of every object type. For
+ example, integer objects are managed differently within the heap than
+ strings, tuples or dictionaries because integers imply different
+ storage requirements and speed/space tradeoffs. The Python memory
+ manager thus delegates some of the work to the object-specific
+ allocators, but ensures that the latter operate within the bounds of
+ the private heap.
+ 
+ It is important to understand that the management of the Python heap
+ is performed by the interpreter itself and that the user has no
+ control on it, even if she manipulates regularly object pointers to
+ memory blocks inside that heap. The allocation of heap space for
+ Python objects and other internal buffers is performed on demand by
+ the Python memory manager through the Python/C API functions listed in
+ this document.
+ 
+ To avoid memory corruption, extension writers should never try to
+ operate on Python objects with the functions exported by the C
+ library: \cfunction{malloc()}, \cfunction{calloc()},
+ \cfunction{realloc()} and \cfunction{free()}. This will result in
+ mixed calls between the C allocator and the Python memory manager
+ with fatal consequences, because they implement different algorithms
+ and operate on different heaps. However, one may safely allocate and
+ release memory blocks with the C library allocator for individual
+ purposes, as shown in the following example:
+ 
+ \begin{verbatim}
+ {
+     PyObject *res;
+     char *buf = (char *) malloc(BUFSIZ); /* for I/O */
+     if (buf == NULL)
+         return PyErr_NoMemory();
+     ...Do some I/O operation involving buf...
+     res = PyString_FromString(buf);
+     free(buf); /* malloc'ed */
+     return res;
+ }
+ \end{verbatim}
+ 
+ In this example, the memory request for the I/O buffer is handled by
+ the C library allocator. The Python memory manager is involved only
+ in the allocation of the string object returned as a result.
+ 
+ In most situations, however, it is recommended to allocate memory from
+ the Python heap specifically because the latter is under control of
+ the Python memory manager. For example, this is required when the
+ interpreter is extended with new object types written in C. Another
+ reason for using the Python heap is the desire to \emph{inform} the
+ Python memory manager about the memory needs of the extension module.
+ Even when the requested memory is used exclusively for internal,
+ highly-specific purposes, delegating all memory requests to the Python
+ memory manager causes the interpreter to have a more accurate image of
+ its memory footprint as a whole. Consequently, under certain
+ circumstances, the Python memory manager may or may not trigger
+ appropriate actions, like garbage collection, memory compaction or
+ other preventive procedures. Note that by using the C library
+ allocator as shown in the previous example, the allocated memory for
+ the I/O buffer escapes completely the Python memory manager.
+ 
+ \section{Memory Interface \label{memoryInterface}}
+ 
+ The following function sets, modeled after the ANSI-C standard, are
+ available for allocating and releasing memory from the Python heap:
+ 
+ \begin{cfuncdesc}{ANY*}{PyMem_Malloc}{size_t n}
+ Allocates \var{n} bytes and returns a pointer of type \ctype{ANY*} to
+ the allocated memory, or \NULL{} if the request fails. Requesting zero
+ bytes returns a non-\NULL{} pointer.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{ANY*}{PyMem_Realloc}{ANY *p, size_t n}
+ Resizes the memory block pointed to by \var{p} to \var{n} bytes. The
+ contents will be unchanged to the minimum of the old and the new
+ sizes. If \var{p} is \NULL{}, the call is equivalent to
+ \cfunction{PyMem_Malloc(\var{n})}; if \var{n} is equal to zero, the memory block
+ is resized but is not freed, and the returned pointer is non-\NULL{}.
+ Unless \var{p} is \NULL{}, it must have been returned by a previous
+ call to \cfunction{PyMem_Malloc()} or \cfunction{PyMem_Realloc()}.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{void}{PyMem_Free}{ANY *p}
+ Frees the memory block pointed to by \var{p}, which must have been
+ returned by a previous call to \cfunction{PyMem_Malloc()} or
+ \cfunction{PyMem_Realloc()}.  Otherwise, or if
+ \cfunction{PyMem_Free(p)} has been called before, undefined behaviour
+ occurs. If \var{p} is \NULL{}, no operation is performed.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{ANY*}{Py_Malloc}{size_t n}
+ Same as \cfunction{PyMem_Malloc()}, but calls
+ \cfunction{PyErr_NoMemory()} on failure.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{ANY*}{Py_Realloc}{ANY *p, size_t n}
+ Same as \cfunction{PyMem_Realloc()}, but calls
+ \cfunction{PyErr_NoMemory()} on failure.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{void}{Py_Free}{ANY *p}
+ Same as \cfunction{PyMem_Free()}.
+ \end{cfuncdesc}
+ 
+ The following type-oriented macros are provided for convenience:
+ 
+ \begin{cfuncdesc}{TYPE*}{PyMem_NEW}{TYPE, size_t n}
+ Same as \cfunction{PyMem_Malloc()}, but allocates \var{(n *
+ sizeof(TYPE))} bytes of memory. Returns a pointer casted to
+ \ctype{TYPE*}.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{TYPE*}{PyMem_RESIZE}{ANY *p, TYPE, size_t n}
+ Same as \cfunction{PyMem_Realloc()}, but the memory block is resized
+ to \var{(n * sizeof(TYPE))} bytes. Returns a pointer casted to
+ \ctype{TYPE*}.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{void}{PyMem_DEL}{ANY *p}
+ Same as \cfunction{PyMem_Free()}.
+ \end{cfuncdesc}
+ 
+ 
+ \section{Examples \label{memoryExamples}}
+ 
+ Here is the example from section 1, rewritten so that the I/O buffer is
+ allocated from the Python heap by using the first function set:
+ 
+ \begin{verbatim}
+ {
+     PyObject *res;
+     char *buf = (char *) PyMem_Malloc(BUFSIZ); /* for I/O */
+     if (buf == NULL)
+         return PyErr_NoMemory();
+     ...Do some I/O operation involving buf...
+     res = PyString_FromString(buf);
+     PyMem_Free(buf); /* allocated with PyMem_Malloc */
+     return res;
+ }
+ \end{verbatim}
+ 
+ With the second function set, the need to call
+ \cfunction{PyErr_NoMemory()} is obviated:
+ 
+ \begin{verbatim}
+ {
+     PyObject *res;
+     char *buf = (char *) Py_Malloc(BUFSIZ); /* for I/O */
+     if (buf == NULL)
+         return NULL;
+     ...Do some I/O operation involving buf...
+     res = PyString_FromString(buf);
+     Py_Free(buf); /* allocated with Py_Malloc */
+     return res;
+ }
+ \end{verbatim}
+ 
+ The same code using the macro set:
+ 
+ \begin{verbatim}
+ {
+     PyObject *res;
+     char *buf = PyMem_NEW(char, BUFSIZ); /* for I/O */
+     if (buf == NULL)
+         return PyErr_NoMemory();
+     ...Do some I/O operation involving buf...
+     res = PyString_FromString(buf);
+     PyMem_DEL(buf); /* allocated with PyMem_NEW */
+     return res;
+ }
+ \end{verbatim}
+ 
+ Note that in the three examples above, the buffer is always
+ manipulated via functions/macros belonging to the same set. Indeed, it
+ is highly recommended to use the same memory API family for a given
+ memory block, so that the risk of mixing different allocators is
+ reduced to a minimum. The following code sequence contains two errors,
+ one of which is labeled as \emph{fatal} because it mixes two different
+ allocators operating on different heaps.
+ 
+ \begin{verbatim}
+ char *buf1 = PyMem_NEW(char, BUFSIZ);
+ char *buf2 = (char *) malloc(BUFSIZ);
+ char *buf3 = (char *) PyMem_Malloc(BUFSIZ);
+ ...
+ PyMem_DEL(buf3);  /* Wrong -- should be PyMem_Free() */
+ free(buf2);       /* Right -- allocated via malloc() */
+ free(buf1);       /* Fatal -- should be PyMem_DEL()  */
+ \end{verbatim}
+ 
+ In addition to the functions aimed at handling raw memory blocks from
+ the Python heap, objects in Python are allocated and released with
+ \cfunction{_PyObject_New()}, \cfunction{_PyObject_NewVar()},
+ \cfunction{_PyObject_Del()}, or with their corresponding macros
+ \cfunction{PyObject_NEW()}, \cfunction{PyObject_NEW_VAR()},
+ \cfunction{PyObject_DEL()}.
+ 
+ % These will be explained in the next chapter on defining and
+ % implementing new object types in C.
  
  



From fdrake@weyr.cnri.reston.va.us  Tue Feb 29 15:57:58 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 29 Feb 2000 10:57:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.13,1.56.2.14
Message-ID: <200002291557.KAA28645@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p2/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Oops, better add in the appropriate \sectionauthor for Vladimir!


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.13
retrieving revision 1.56.2.14
diff -C2 -r1.56.2.13 -r1.56.2.14
*** api.tex	2000/02/29 15:53:03	1.56.2.13
--- api.tex	2000/02/29 15:57:55	1.56.2.14
***************
*** 3247,3250 ****
--- 3247,3251 ----
  
  \chapter{Memory Management \label{memory}}
+ \sectionauthor{Vladimir Marangozov}{Vladimir.Marangozov@inrialpes.fr}
  
  \section{Overview \label{memoryOverview}}



From fdrake@weyr.cnri.reston.va.us  Tue Feb 29 16:12:58 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 29 Feb 2000 11:12:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.14,1.56.2.15
Message-ID: <200002291612.LAA28762@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p2/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Adjustment from Vladimir so that 1.6 API isn't documented for 1.5.2.

Added XXX comment to look at after merging changes for 1.6 docs.


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.14
retrieving revision 1.56.2.15
diff -C2 -r1.56.2.14 -r1.56.2.15
*** api.tex	2000/02/29 15:57:55	1.56.2.14
--- api.tex	2000/02/29 16:12:55	1.56.2.15
***************
*** 3453,3460 ****
  In addition to the functions aimed at handling raw memory blocks from
  the Python heap, objects in Python are allocated and released with
! \cfunction{_PyObject_New()}, \cfunction{_PyObject_NewVar()},
! \cfunction{_PyObject_Del()}, or with their corresponding macros
! \cfunction{PyObject_NEW()}, \cfunction{PyObject_NEW_VAR()},
! \cfunction{PyObject_DEL()}.
  
  % These will be explained in the next chapter on defining and
--- 3453,3465 ----
  In addition to the functions aimed at handling raw memory blocks from
  the Python heap, objects in Python are allocated and released with
! \cfunction{_PyObject_New()} and \cfunction{_PyObject_NewVar()}, or
! with their corresponding macros
! \cfunction{PyObject_NEW()} and \cfunction{PyObject_NEW_VAR()}.
! 
! % XXX use this for Python 1.6:
! % \cfunction{_PyObject_New()}, \cfunction{_PyObject_NewVar()},
! % \cfunction{_PyObject_Del()}, or with their corresponding macros
! % \cfunction{PyObject_NEW()}, \cfunction{PyObject_NEW_VAR()},
! % \cfunction{PyObject_DEL()}.
  
  % These will be explained in the next chapter on defining and



From fdrake@weyr.cnri.reston.va.us  Tue Feb 29 18:40:58 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 29 Feb 2000 13:40:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/ext ext.tex,1.68.2.6,1.68.2.7
Message-ID: <200002291840.NAA29275@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/ext
In directory weyr:/home/fdrake/projects/python/Doc-152p2/ext

Modified Files:
      Tag: release152p1-patches
	ext.tex 
Log Message:

Integrate some feedback from Eddy Welbourne <eddyw@lsl.co.uk>:

  - extraneous "by" in text around a simple example
  - don't imply that errno is Unix-specific; it's ANSI C
  - clarify statement about malloc() & realloc() callers needing to
    raise the appropriate exception


Index: ext.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/ext/ext.tex,v
retrieving revision 1.68.2.6
retrieving revision 1.68.2.7
diff -C2 -r1.68.2.6 -r1.68.2.7
*** ext.tex	2000/02/16 17:25:40	1.68.2.6
--- ext.tex	2000/02/29 18:40:55	1.68.2.7
***************
*** 163,167 ****
  whose addresses are passed.  It returns false (zero) if an invalid
  argument list was passed.  In the latter case it also raises an
! appropriate exception by so the calling function can return
  \NULL{} immediately (as we saw in the example).
  
--- 163,167 ----
  whose addresses are passed.  It returns false (zero) if an invalid
  argument list was passed.  In the latter case it also raises an
! appropriate exception so the calling function can return
  \NULL{} immediately (as we saw in the example).
  
***************
*** 196,200 ****
  Another useful function is \cfunction{PyErr_SetFromErrno()}, which only
  takes an exception argument and constructs the associated value by
! inspection of the (\UNIX{}) global variable \cdata{errno}.  The most
  general function is \cfunction{PyErr_SetObject()}, which takes two object
  arguments, the exception and its associated value.  You don't need to
--- 196,200 ----
  Another useful function is \cfunction{PyErr_SetFromErrno()}, which only
  takes an exception argument and constructs the associated value by
! inspection of the global variable \cdata{errno}.  The most
  general function is \cfunction{PyErr_SetObject()}, which takes two object
  arguments, the exception and its associated value.  You don't need to
***************
*** 232,241 ****
  nothing happened).
  
! Note that a failing \cfunction{malloc()} call must be turned into an
  exception --- the direct caller of \cfunction{malloc()} (or
  \cfunction{realloc()}) must call \cfunction{PyErr_NoMemory()} and
  return a failure indicator itself.  All the object-creating functions
! (\cfunction{PyInt_FromLong()} etc.) already do this, so only if you
! call \cfunction{malloc()} directly this note is of importance.
  
  Also note that, with the important exception of
--- 232,241 ----
  nothing happened).
  
! Every failing \cfunction{malloc()} call must be turned into an
  exception --- the direct caller of \cfunction{malloc()} (or
  \cfunction{realloc()}) must call \cfunction{PyErr_NoMemory()} and
  return a failure indicator itself.  All the object-creating functions
! (for example, \cfunction{PyInt_FromLong()}) already do this, so this
! note is only relevant to those who call \cfunction{malloc()} directly.
  
  Also note that, with the important exception of



From fdrake@weyr.cnri.reston.va.us  Tue Feb  1 03:48:58 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 31 Jan 2000 22:48:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcode.tex,1.9,1.9.4.1 libcodeop.tex,1.1,1.1.2.1
Message-ID: <200002010348.WAA16800@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libcode.tex libcodeop.tex 
Log Message:
Update descriptions.

For the code module, add information about the interpreter base classes,
since that's what is really interesting here.


Index: libcode.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libcode.tex,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -C2 -r1.9 -r1.9.4.1
*** libcode.tex	1999/01/27 15:48:23	1.9
--- libcode.tex	2000/02/01 03:48:54	1.9.4.1
***************
*** 1,30 ****
  \section{\module{code} ---
!          Code object services.}
  \declaremodule{standard}{code}
  
! \modulesynopsis{Code object services.}
  
  
! The \code{code} module defines operations pertaining to Python code
! objects.  It defines the following function:
! 
  
! \begin{funcdesc}{compile_command}{source, \optional{filename\optional{, symbol}}}
  This function is useful for programs that want to emulate Python's
  interpreter main loop (a.k.a. the read-eval-print loop).  The tricky
  part is to determine when the user has entered an incomplete command
! that can be completed by entering more text (as opposed to a complete
! command or a syntax error).  This function \emph{almost} always makes
! the same decision as the real interpreter main loop.
! 
! Arguments: \var{source} is the source string; \var{filename} is the
! optional filename from which source was read, defaulting to
! \code{'<input>'}; and \var{symbol} is the optional grammar start
! symbol, which should be either \code{'single'} (the default) or
! \code{'eval'}.
! 
! Return a code object (the same as \code{compile(\var{source},
! \var{filename}, \var{symbol})}) if the command is complete and valid;
! return \code{None} if the command is incomplete; raise
! \exception{SyntaxError} if the command is a syntax error.
  \end{funcdesc}
--- 1,173 ----
  \section{\module{code} ---
!          Interpreter base classes}
  \declaremodule{standard}{code}
  
! \modulesynopsis{Base classes for interactive Python interpreters.}
  
  
! The \code{code} module provides facilities to implement
! read-eval-print loops in Python.  Two classes and convenience
! functions are included which can be used to build applications which
! provide an interactive interpreter prompt.
! 
! 
! \begin{classdesc}{InteractiveInterpreter}{\optional{locals}}
! This class deals with parsing and interpreter state (the user's
! namespace); it does not deal with input buffering or prompting or
! input file naming (the filename is always passed in explicitly).
! The optional \var{locals} argument specifies the dictionary in
! which code will be executed; it defaults to a newly created
! dictionary with key \code{'__name__'} set to \code{'__console__'}
! and key \code{'__doc__'} set to \code{None}.
! \end{classdesc}
! 
! \begin{classdesc}{InteractiveConsole}{\optional{locals\optional{, filename}}}
! Closely emulate the behavior of the interactive Python interpreter.
! This class builds on \class{InteractiveInterpreter} and adds
! prompting using the familiar \code{sys.ps1} and \code{sys.ps2}, and
! input buffering.
! \end{classdesc}
! 
! 
! \begin{funcdesc}{interact}{\optional{banner\optional{,
!                            readfunc\optional{, local}}}}
! Convenience function to run a read-eval-print loop.  This creates a
! new instance of \class{InteractiveConsole} and sets \var{readfunc}
! to be used as the \method{raw_input()} method, if provided.  If
! \var{local} is provided, it is passed to the
! \class{InteractiveConsole} constructor for use as the default
! namespace for the interpreter loop.  The \method{interact()} method
! of the instance is then run with \var{banner} passed as the banner
! to use, if provided.  The console object is discarded after use.
! \end{funcdesc}
  
! \begin{funcdesc}{compile_command}{source\optional{,
!                                   filename\optional{, symbol}}}
  This function is useful for programs that want to emulate Python's
  interpreter main loop (a.k.a. the read-eval-print loop).  The tricky
  part is to determine when the user has entered an incomplete command
! that can be completed by entering more text (as opposed to a
! complete command or a syntax error).  This function
! \emph{almost} always makes the same decision as the real interpreter
! main loop.
! 
! \var{source} is the source string; \var{filename} is the optional
! filename from which source was read, defaulting to \code{'<input>'};
! and \var{symbol} is the optional grammar start symbol, which should
! be either \code{'single'} (the default) or \code{'eval'}.
! 
! Returns a code object (the same as \code{compile(\var{source},
! \var{filename}, \var{symbol})}) if the command is complete and
! valid; \code{None} if the command is incomplete; raises
! \exception{SyntaxError} if the command is complete and contains a
! syntax error, or raises \exception{OverflowError} if the command
! includes a numeric constant which exceeds the range of the
! appropriate numeric type.
  \end{funcdesc}
+ 
+ 
+ \subsection{Interactive Interpreter Objects
+             \label{interpreter-objects}}
+ 
+ \begin{methoddesc}{runsource}{source\optional{, filename\optional{, symbol}}}
+ Compile and run some source in the interpreter.
+ Arguments are the same as for \function{compile_command()}; the
+ default for \var{filename} is \code{'<input>'}, and for
+ \var{symbol} is \code{'single'}.  One several things can happen:
+ 
+ \begin{itemize}
+ \item
+ The input is incorrect; \function{compile_command()} raised an
+ exception (\exception{SyntaxError} or \exception{OverflowError}).  A
+ syntax traceback will be printed by calling the
+ \method{showsyntaxerror()} method.  \method{runsource()} returns
+ \code{0}.
+ 
+ \item
+ The input is incomplete, and more input is required;
+ \function{compile_command()} returned \code{None}.
+ \method{runsource()} returns \code{1}.
+ 
+ \item
+ The input is complete; \function{compile_command()} returned a code
+ object.  The code is executed by calling the \method{runcode()} (which
+ also handles run-time exceptions, except for \exception{SystemExit}).
+ \method{runsource()} returns \code{0}.
+ \end{itemize}
+ 
+ The return value can be used to decide whether to use
+ \code{sys.ps1} or \code{sys.ps2} to prompt the next line.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{runcode}{code}
+ Execute a code object.
+ When an exception occurs, \method{showtraceback()} is called to
+ display a traceback.  All exceptions are caught except
+ \exception{SystemExit}, which is allowed to propogate.
+ 
+ A note about \exception{KeyboardInterrupt}: this exception may occur
+ elsewhere in this code, and may not always be caught.  The caller
+ should be prepared to deal with it.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{showsyntaxerror}{\optional{filename}}
+ Display the syntax error that just occurred.  This does not display
+ a stack trace because there isn't one for syntax errors.
+ If \var{filename} is given, it is stuffed into the exception instead
+ of the default filename provided by Python's parser, because it
+ always uses \code{'<string>'} when reading from a string.
+ The output is written by the \method{write()} method.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{showtraceback}{}
+ Display the exception that just occurred.  We remove the first stack
+ item because it is within the interpreter object implementation.
+ The output is written by the \method{write()} method.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{write}{data}
+ Write a string to standard output.  Derived classes should override
+ this to provide the appropriate output handling as needed.
+ \end{methoddesc}
+ 
+ 
+ \subsection{Interactive Console Objects
+             \label{console-objects}}
+ 
+ The \class{InteractiveConsole} class is a subclass of
+ \class{InteractiveInterpreter}, and so offers all the methods of the
+ interpreter objects as well as the following additions.
+ 
+ \begin{methoddesc}{interact}{\optional{banner}}
+ Closely emulate the interactive Python console.
+ The optional banner argument specify the banner to print before the
+ first interaction; by default it prints a banner similar to the one
+ printed by the standard Python interpreter, followed by the class
+ name of the console object in parentheses (so as not to confuse this
+ with the real interpreter -- since it's so close!).
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{push}{line}
+ Push a line of source text to the interpreter.
+ The line should not have a trailing newline; it may have internal
+ newlines.  The line is appended to a buffer and the interpreter's
+ \method{runsource()} method is called with the concatenated contents
+ of the buffer as source.  If this indicates that the command was
+ executed or invalid, the buffer is reset; otherwise, the command is
+ incomplete, and the buffer is left as it was after the line was
+ appended.  The return value is \code{1} if more input is required,
+ \code{0} if the line was dealt with in some way (this is the same as
+ \method{runsource()}).
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{resetbuffer}{}
+ Remove any unhandled source text from the input buffer.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{raw_input}{\optional{prompt}}
+ Write a prompt and read a line.  The returned line does not include
+ the trailing newline.  When the user enters the \EOF{} key sequence,
+ \exception{EOFError} is raised.  The base implementation uses the
+ built-in function \function{raw_input()}; a subclass may replace this
+ with a different implementation.
+ \end{methoddesc}

Index: libcodeop.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libcodeop.tex,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** libcodeop.tex	1999/06/23 13:33:40	1.1
--- libcodeop.tex	2000/02/01 03:48:54	1.1.2.1
***************
*** 1,6 ****
- % LaTeXed from excellent doc-string.
  \section{\module{codeop} ---
           Compile Python code}
  
  \declaremodule{standard}{codeop}
  \sectionauthor{Moshe Zadka}{mzadka@geocities.com}
--- 1,7 ----
  \section{\module{codeop} ---
           Compile Python code}
  
+ % LaTeXed from excellent doc-string.
+ 
  \declaremodule{standard}{codeop}
  \sectionauthor{Moshe Zadka}{mzadka@geocities.com}
***************
*** 8,12 ****
  
  The \module{codeop} module provides a function to compile Python code
! with hints on whether it certainly complete, possible complete or
  definitely incomplete.  This is used by the \refmodule{code} module
  and should not normally be used directly.
--- 9,13 ----
  
  The \module{codeop} module provides a function to compile Python code
! with hints on whether it is certainly complete, possibly complete or
  definitely incomplete.  This is used by the \refmodule{code} module
  and should not normally be used directly.
***************
*** 16,38 ****
  \begin{funcdesc}{compile_command}
                  {source\optional{, filename\optional{, symbol}}}
! 
! Try to compile \var{source}, which should be a string of Python
! code. Return a code object if \var{source} is valid
  Python code. In that case, the filename attribute of the code object
  will be \var{filename}, which defaults to \code{'<input>'}.
! 
! Return \code{None} if \var{source} is \emph{not} valid Python
  code, but is a prefix of valid Python code.
- 
- Raise an exception if there is a problem with \var{source}:
- \begin{itemize}
-         \item \exception{SyntaxError}
-               if there is invalid Python syntax.
-         \item \exception{OverflowError}
-               if there is an invalid numeric constant.
- \end{itemize}
  
! The \var{symbol} argument means whether to compile it as a statement
! (\code{'single'}, the default) or as an expression (\code{'eval'}).
  
  \strong{Caveat:}
--- 17,36 ----
  \begin{funcdesc}{compile_command}
                  {source\optional{, filename\optional{, symbol}}}
! Tries to compile \var{source}, which should be a string of Python
! code and return a code object if \var{source} is valid
  Python code. In that case, the filename attribute of the code object
  will be \var{filename}, which defaults to \code{'<input>'}.
! Returns \code{None} if \var{source} is \emph{not} valid Python
  code, but is a prefix of valid Python code.
  
! If there is a problem with \var{source}, an exception will be raised.
! \exception{SyntaxError} is raised if there is invalid Python syntax,
! and \exception{OverflowError} if there is an invalid numeric
! constant.
! 
! The \var{symbol} argument determines whether \var{source} is compiled
! as a statement (\code{'single'}, the default) or as an expression
! (\code{'eval'}).  Any other value will cause \exception{ValueError} to 
! be raised.
  
  \strong{Caveat:}



From fdrake@weyr.cnri.reston.va.us  Tue Feb  1 18:18:44 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 1 Feb 2000 13:18:44 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/html style.css,1.4.4.1,1.4.4.2
Message-ID: <200002011818.NAA18704@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/html
In directory weyr:/home/fdrake/projects/python/Doc-152p1/html

Modified Files:
      Tag: release152p1-patches
	style.css 
Log Message:

Don't name the Courier font; use monospace and let the browser apply
the best available font.  Based on a comment by Mauro Cicognini
<mcicogni@siosistemi.it>.

Added a couple of additional style rules for refcount information.


Index: style.css
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/html/style.css,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -r1.4.4.1 -r1.4.4.2
*** style.css	1999/12/21 15:59:38	1.4.4.1
--- style.css	2000/02/01 18:18:41	1.4.4.2
***************
*** 33,37 ****
  h2			{ font-size: 150% }
  h3, h4			{ font-size: 120% }
! code, tt		{ font-family: courier }
  var			{ font: italic normal serif }
  
--- 33,37 ----
  h2			{ font-size: 150% }
  h3, h4			{ font-size: 120% }
! code, tt		{ font-family: monospace }
  var			{ font: italic normal serif }
  
***************
*** 46,49 ****
--- 46,53 ----
  .url			{ font-family: avantgarde, sans-serif }
  .file			{ font-family: avantgarde, sans-serif }
+ 
+ .refcount-info          { font-style: italic }
+ .refcount-info .value   { font-weight: bold;
+                           color: #006600 }
  
  /*



From fdrake@weyr.cnri.reston.va.us  Tue Feb  1 19:06:43 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 1 Feb 2000 14:06:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/perl python.perl,1.65.2.2,1.65.2.3
Message-ID: <200002011906.OAA19183@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/perl
In directory weyr:/home/fdrake/projects/python/Doc-152p1/perl

Modified Files:
      Tag: release152p1-patches
	python.perl 
Log Message:

Added magic to read from api/refcounts.dat file to generate reference
count information for return values, only for return values of type
PyObject*.

This should take care of *most* questions about reference count
details, but only for the HTML users.

Still needed:  explanations of exceptions to the normal refcounting
rules in the descriptive text of the appropriate functions, and
support for non-HTML formats.


Index: python.perl
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.65.2.2
retrieving revision 1.65.2.3
diff -C2 -r1.65.2.2 -r1.65.2.3
*** python.perl	1999/10/28 18:44:21	1.65.2.2
--- python.perl	2000/02/01 19:06:40	1.65.2.3
***************
*** 559,562 ****
--- 559,595 ----
  }
  
+ $REFCOUNTS_LOADED = 0;
+ 
+ sub load_refcounts{
+     $REFCOUNTS_LOADED = 1;
+ 
+     use File::Basename;
+     my $myname, $mydir, $myext;
+     ($myname, $mydir, $myext) = fileparse(__FILE__, '\..*');
+     chop $mydir;			# remove trailing '/'
+     ($myname, $mydir, $myext) = fileparse($mydir, '\..*');
+     chop $mydir;			# remove trailing '/'
+     $mydir = getcwd() . "$dd$mydir"
+       unless $mydir =~ s|^/|/|;
+     local $_;
+     my $filename = "$mydir${dd}api${dd}refcounts.dat";
+     open(REFCOUNT_FILE, "<$filename") || die "\n$!\n";
+     print "[loading API refcount data]";
+     while (<REFCOUNT_FILE>) {
+         if (/([a-zA-Z0-9_]+):PyObject\*:([a-zA-Z0-9_]*):(0|[-+]1):(.*)$/) {
+             my($func, $param, $count, $comment) = ($1, $2, $3, $4);
+             #print "\n$func($param) --> $count";
+             $REFCOUNTS{"$func:$param"} = $count;
+         }
+     }
+ }
+ 
+ sub get_refcount{
+     my ($func, $param) = @_;
+     load_refcounts()
+         unless $REFCOUNTS_LOADED;
+     return $REFCOUNTS{"$func:$param"};
+ }
+ 
  sub do_env_cfuncdesc{
      local($_) = @_;
***************
*** 568,572 ****
--- 601,619 ----
      $idx =~ s/ \(.*\)//;
      $idx =~ s/\(\)//;		# ????
+     my $result_rc = get_refcount($function_name, '');
+     my $rcinfo = '';
+     if ($result_rc eq '+1') {
+         $rcinfo = '<span class="label">Return value:</span>'
+                   . "\n  <span class=\"value\">New reference.</span>";
+     }
+     elsif ($result_rc eq '0') {
+         $rcinfo = '<span class="label">Return value:</span>'
+                   . "\n  <span class=\"value\">Borrowed reference.</span>";
+     }
+     if ($rcinfo ne '') {
+         $rcinfo = "\n<div class=\"refcount-info\">\n  $rcinfo\n</div>";
+     }
      return "<dl><dt>$return_type <b>$idx</b> (<var>$arg_list</var>)\n<dd>"
+            . $rcinfo
             . $_
             . '</dl>';



From fdrake@weyr.cnri.reston.va.us  Tue Feb  1 20:12:41 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 1 Feb 2000 15:12:41 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules cryptmodule.c,2.5,2.6
Message-ID: <200002012012.PAA19882@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory weyr:/home/fdrake/projects/python/Modules

Modified Files:
	cryptmodule.c 
Log Message:

Added docstring to crypt.crypt() based on the documentation.


Index: cryptmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/cryptmodule.c,v
retrieving revision 2.5
retrieving revision 2.6
diff -C2 -r2.5 -r2.6
*** cryptmodule.c	1998/12/04 18:49:42	2.5
--- cryptmodule.c	2000/02/01 20:12:39	2.6
***************
*** 23,28 ****
  }
  
  static PyMethodDef crypt_methods[] = {
! 	{"crypt",	crypt_crypt},
  	{NULL,		NULL}		/* sentinel */
  };
--- 23,37 ----
  }
  
+ static char crypt_crypt__doc__[] = "\
+ crypt(word, salt) -> string\n\
+ word will usually be a user's password. salt is a 2-character string\n\
+ which will be used to select one of 4096 variations of DES. The characters\n\
+ in salt must be either \".\", \"/\", or an alphanumeric character. Returns\n\
+ the hashed password as a string, which will be composed of characters from\n\
+ the same alphabet as the salt.";
+ 
+ 
  static PyMethodDef crypt_methods[] = {
! 	{"crypt",	crypt_crypt, 0, crypt_crypt__doc__},
  	{NULL,		NULL}		/* sentinel */
  };



From guido@cnri.reston.va.us  Tue Feb  1 23:36:58 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 1 Feb 2000 18:36:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib urllib.py,1.89,1.90
Message-ID: <200002012336.SAA20090@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	urllib.py 
Log Message:
Sjoerd Mullender writes:

Fixed a TypeError: not enough arguments; expected 4, got 3.
When authentication is needed, the default http_error_401 method calls 
retry_http_basic_auth.  The default version of that method expected a
data argument which wasn't provided, so now we provide the argument if 
it was given and we also made the data argument optional.

Also changed other calls where data was optional to not pass data if
it was not passed to the calling method (in line with other similar
occurances).


Index: urllib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/urllib.py,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -r1.89 -r1.90
*** urllib.py	1999/12/07 21:37:17	1.89
--- urllib.py	2000/02/01 23:36:55	1.90
***************
*** 500,504 ****
          # In case the server sent a relative URL, join with original:
          newurl = basejoin("http:" + url, newurl)
!         return self.open(newurl, data)
  
      # Error 301 -- also relocated (permanently)
--- 500,507 ----
          # In case the server sent a relative URL, join with original:
          newurl = basejoin("http:" + url, newurl)
!         if data is None:
!             return self.open(newurl)
!         else:
!             return self.open(newurl, data)
  
      # Error 301 -- also relocated (permanently)
***************
*** 518,524 ****
                  if string.lower(scheme) == 'basic':
                     name = 'retry_' + self.type + '_basic_auth'
!                    return getattr(self,name)(url, realm)
  
!     def retry_http_basic_auth(self, url, realm, data):
          host, selector = splithost(url)
          i = string.find(host, '@') + 1
--- 521,530 ----
                  if string.lower(scheme) == 'basic':
                     name = 'retry_' + self.type + '_basic_auth'
!                    if data is None:
!                        return getattr(self,name)(url, realm)
!                    else:
!                        return getattr(self,name)(url, realm, data)
  
!     def retry_http_basic_auth(self, url, realm, data=None):
          host, selector = splithost(url)
          i = string.find(host, '@') + 1
***************
*** 528,534 ****
          host = user + ':' + passwd + '@' + host
          newurl = 'http://' + host + selector
!         return self.open(newurl, data)
     
!     def retry_https_basic_auth(self, url, realm):
              host, selector = splithost(url)
              i = string.find(host, '@') + 1
--- 534,543 ----
          host = user + ':' + passwd + '@' + host
          newurl = 'http://' + host + selector
!         if data is None:
!             return self.open(newurl)
!         else:
!             return self.open(newurl, data)
     
!     def retry_https_basic_auth(self, url, realm, data=None):
              host, selector = splithost(url)
              i = string.find(host, '@') + 1



Return-Path: <guido@kaluha.cnri.reston.va.us>
Delivered-To: python-checkins@dinsdale.python.org
Received: from python.org (parrot.python.org [132.151.1.90])
	by dinsdale.python.org (Postfix) with ESMTP id 891DA1CD42
	for <python-checkins@dinsdale.python.org>; Wed,  2 Feb 2000 10:08:59 -0500 (EST)
Received: from cnri.reston.va.us (ns.CNRI.Reston.VA.US [132.151.1.1] (may be forged))
	by python.org (8.9.1a/8.9.1) with ESMTP id KAA28495
	for <python-checkins@python.org>; Wed, 2 Feb 2000 10:08:57 -0500 (EST)
Received: from kaluha.cnri.reston.va.us (kaluha.cnri.reston.va.us [132.151.7.31])
	by cnri.reston.va.us (8.9.1a/8.9.1) with ESMTP id KAA12031
	for <python-checkins@python.org>; Wed, 2 Feb 2000 10:08:58 -0500 (EST)
Received: from eric.cnri.reston.va.us (eric.cnri.reston.va.us [10.27.10.23])
	by kaluha.cnri.reston.va.us (8.9.1b+Sun/8.9.1) with ESMTP id KAA05279
	for <python-checkins@python.org>; Wed, 2 Feb 2000 10:10:22 -0500 (EST)
Received: (from guido@localhost)
	by eric.cnri.reston.va.us (8.9.3+Sun/8.9.1) id KAA22017
	for python-checkins@python.org; Wed, 2 Feb 2000 10:10:20 -0500 (EST)
Date: Wed, 2 Feb 2000 10:10:20 -0500 (EST)
From: Guido van Rossum <guido@cnri.reston.va.us>
Message-Id: <200002021510.KAA22017@eric.cnri.reston.va.us>
To: python-checkins@python.org
Subject: [Python-checkins] CVS: python/dist/src/Lib fpformat.py,1.5,1.6 copy_reg.py,1.2,1.3 bisect.py,1.3,1.4 audiodev.py,1.7,1.8 UserList.py,1.7,1.8 UserDict.py,1.6,1.7 StringIO.py,1.7,1.8 Queue.py,1.9,1.10 dircmp.py,1.7,1.8 dircache.py,1.4,1.5 cmpcache.py,1.7,1.8 cmp.py,1.7,1.8 cmd.py,1.16,1.17 calendar.py,1.14,1.15 binhex.py,1.10,1.11 bdb.py,1.26,1.27 base64.py,1.8,1.9 aifc.py,1.34,1.35
Sender: python-checkins-admin@python.org
Errors-To: python-checkins-admin@python.org
X-BeenThere: python-checkins@python.org
X-Mailman-Version: 1.2 (experimental)
Precedence: bulk
List-Id: Check-in messages from the Python maintainers <python-checkins.python.org>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	fpformat.py copy_reg.py bisect.py audiodev.py UserList.py 
	UserDict.py StringIO.py Queue.py dircmp.py dircache.py 
	cmpcache.py cmp.py cmd.py calendar.py binhex.py bdb.py 
	base64.py aifc.py 
Log Message:
Mass patch by Ka-Ping Yee:

    1. Comments at the beginning of the module, before
       functions, and before classes have been turned
       into docstrings.

    2. Tabs are normalized to four spaces.

Also, removed the "remove" function from dircmp.py, which reimplements
list.remove() (it must have been very old).



Index: fpformat.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/fpformat.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** fpformat.py	1999/09/10 14:34:48	1.5
--- fpformat.py	2000/02/02 15:10:13	1.6
***************
*** 1,14 ****
! # General floating point formatting functions.
  
! # Functions:
! # fix(x, digits_behind)
! # sci(x, digits_behind)
  
! # Each takes a number or a string and a number of digits as arguments.
  
! # Parameters:
! # x:             number to be formatted; or a string resembling a number
! # digits_behind: number of digits behind the decimal point
! 
  
  import re
--- 1,14 ----
! """General floating point formatting functions.
  
! Functions:
! fix(x, digits_behind)
! sci(x, digits_behind)
  
! Each takes a number or a string and a number of digits as arguments.
  
! Parameters:
! x:             number to be formatted; or a string resembling a number
! digits_behind: number of digits behind the decimal point
! """
  
  import re

Index: copy_reg.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/copy_reg.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** copy_reg.py	1997/05/20 18:03:22	1.2
--- copy_reg.py	2000/02/02 15:10:13	1.3
***************
*** 1,3 ****
! # Helper to provide extensibility for pickle/cPickle.
  
  dispatch_table = {}
--- 1,3 ----
! """Helper to provide extensibility for pickle/cPickle."""
  
  dispatch_table = {}

Index: bisect.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/bisect.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** bisect.py	1998/03/26 20:35:09	1.3
--- bisect.py	2000/02/02 15:10:14	1.4
***************
*** 1,25 ****
! # Bisection algorithms
  
  
- # Insert item x in list a, and keep it sorted assuming a is sorted
- 
  def insort(a, x, lo=0, hi=None):
! 	if hi is None:
! 		hi = len(a)
! 	while lo < hi:
! 		mid = (lo+hi)/2
! 		if x < a[mid]: hi = mid
! 		else: lo = mid+1
! 	a.insert(lo, x)
! 
  
- # Find the index where to insert item x in list a, assuming a is sorted
  
  def bisect(a, x, lo=0, hi=None):
! 	if hi is None:
! 		hi = len(a)
! 	while lo < hi:
! 		mid = (lo+hi)/2
! 		if x < a[mid]: hi = mid
! 		else: lo = mid+1
! 	return lo
--- 1,23 ----
! """Bisection algorithms."""
  
  
  def insort(a, x, lo=0, hi=None):
!     """Insert item x in list a, and keep it sorted assuming a is sorted."""
!     if hi is None:
!         hi = len(a)
!     while lo < hi:
!         mid = (lo+hi)/2
!         if x < a[mid]: hi = mid
!         else: lo = mid+1
!     a.insert(lo, x)
  
  
  def bisect(a, x, lo=0, hi=None):
!     """Find the index where to insert item x in list a, assuming a is sorted."""
!     if hi is None:
!         hi = len(a)
!     while lo < hi:
!         mid = (lo+hi)/2
!         if x < a[mid]: hi = mid
!         else: lo = mid+1
!     return lo

Index: audiodev.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/audiodev.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** audiodev.py	1999/05/03 18:04:07	1.7
--- audiodev.py	2000/02/02 15:10:14	1.8
***************
*** 1,2 ****
--- 1,4 ----
+ """Classes for manipulating audio devices (currently only for Sun and SGI)"""
+ 
  error = 'audiodev.error'
  

Index: UserList.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/UserList.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** UserList.py	1999/03/26 16:20:18	1.7
--- UserList.py	2000/02/02 15:10:14	1.8
***************
*** 1,3 ****
! # A more or less complete user-defined wrapper around list objects
  
  class UserList:
--- 1,3 ----
! """A more or less complete user-defined wrapper around list objects."""
  
  class UserList:

Index: UserDict.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/UserDict.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** UserDict.py	1999/03/26 15:31:12	1.6
--- UserDict.py	2000/02/02 15:10:14	1.7
***************
*** 1,3 ****
! # A more or less complete user-defined wrapper around dictionary objects
  
  class UserDict:
--- 1,3 ----
! """A more or less complete user-defined wrapper around dictionary objects."""
  
  class UserDict:

Index: StringIO.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/StringIO.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** StringIO.py	1998/08/18 17:43:08	1.7
--- StringIO.py	2000/02/02 15:10:14	1.8
***************
*** 1,29 ****
! # class StringIO implements  file-like objects that read/write a
! # string buffer (a.k.a. "memory files").
! #
! # This implements (nearly) all stdio methods.
! #
! # f = StringIO()      # ready for writing
! # f = StringIO(buf)   # ready for reading
! # f.close()           # explicitly release resources held
! # flag = f.isatty()   # always false
! # pos = f.tell()      # get current position
! # f.seek(pos)         # set current position
! # f.seek(pos, mode)   # mode 0: absolute; 1: relative; 2: relative to EOF
! # buf = f.read()      # read until EOF
! # buf = f.read(n)     # read up to n bytes
! # buf = f.readline()  # read until end of line ('\n') or EOF
! # list = f.readlines()# list of f.readline() results until EOF
! # f.write(buf)        # write at current position
! # f.writelines(list)  # for line in list: f.write(line)
! # f.getvalue()        # return whole file's contents as a string
! #
! # Notes:
! # - Using a real file is often faster (but less convenient).
! # - fileno() is left unimplemented so that code which uses it triggers
! #   an exception early.
! # - Seeking far beyond EOF and then writing will insert real null
! #   bytes that occupy space in the buffer.
! # - There's a simple test set (see end of this file).
  
  import string
--- 1,29 ----
! """File-like objects that read from or write to a string buffer.
! 
! This implements (nearly) all stdio methods.
! 
! f = StringIO()      # ready for writing
! f = StringIO(buf)   # ready for reading
! f.close()           # explicitly release resources held
! flag = f.isatty()   # always false
! pos = f.tell()      # get current position
! f.seek(pos)         # set current position
! f.seek(pos, mode)   # mode 0: absolute; 1: relative; 2: relative to EOF
! buf = f.read()      # read until EOF
! buf = f.read(n)     # read up to n bytes
! buf = f.readline()  # read until end of line ('\n') or EOF
! list = f.readlines()# list of f.readline() results until EOF
! f.write(buf)        # write at current position
! f.writelines(list)  # for line in list: f.write(line)
! f.getvalue()        # return whole file's contents as a string
! 
! Notes:
! - Using a real file is often faster (but less convenient).
! - fileno() is left unimplemented so that code which uses it triggers
!   an exception early.
! - Seeking far beyond EOF and then writing will insert real null
!   bytes that occupy space in the buffer.
! - There's a simple test set (see end of this file).
! """
  
  import string

Index: Queue.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/Queue.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Queue.py	1999/09/09 14:54:28	1.9
--- Queue.py	2000/02/02 15:10:14	1.10
***************
*** 1,3 ****
! # A multi-producer, multi-consumer queue.
  
  # define this exception to be compatible with Python 1.5's class
--- 1,3 ----
! """A multi-producer, multi-consumer queue."""
  
  # define this exception to be compatible with Python 1.5's class

Index: dircmp.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/dircmp.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** dircmp.py	1992/12/14 12:57:38	1.7
--- dircmp.py	2000/02/02 15:10:14	1.8
***************
*** 1,5 ****
! # Module 'dirmp'
! #
! # Defines a class to build directory diff tools on.
  
  import os
--- 1,3 ----
! """A class to build directory diff tools on."""
  
  import os
***************
*** 10,203 ****
  from stat import *
  
- # Directory comparison class.
- #
  class dircmp:
! 	#
! 	def new(self, a, b): # Initialize
! 		self.a = a
! 		self.b = b
! 		# Properties that caller may change before calling self.run():
! 		self.hide = [os.curdir, os.pardir] # Names never to be shown
! 		self.ignore = ['RCS', 'tags'] # Names ignored in comparison
! 		#
! 		return self
! 	#
! 	def run(self): # Compare everything except common subdirectories
! 		self.a_list = filter(dircache.listdir(self.a), self.hide)
! 		self.b_list = filter(dircache.listdir(self.b), self.hide)
! 		self.a_list.sort()
! 		self.b_list.sort()
! 		self.phase1()
! 		self.phase2()
! 		self.phase3()
! 	#
! 	def phase1(self): # Compute common names
! 		self.a_only = []
! 		self.common = []
! 		for x in self.a_list:
! 			if x in self.b_list:
! 				self.common.append(x)
! 			else:
! 				self.a_only.append(x)
! 		#
! 		self.b_only = []
! 		for x in self.b_list:
! 			if x not in self.common:
! 				self.b_only.append(x)
! 	#
! 	def phase2(self): # Distinguish files, directories, funnies
! 		self.common_dirs = []
! 		self.common_files = []
! 		self.common_funny = []
! 		#
! 		for x in self.common:
! 			a_path = os.path.join(self.a, x)
! 			b_path = os.path.join(self.b, x)
! 			#
! 			ok = 1
! 			try:
! 				a_stat = statcache.stat(a_path)
! 			except os.error, why:
! 				# print 'Can\'t stat', a_path, ':', why[1]
! 				ok = 0
! 			try:
! 				b_stat = statcache.stat(b_path)
! 			except os.error, why:
! 				# print 'Can\'t stat', b_path, ':', why[1]
! 				ok = 0
! 			#
! 			if ok:
! 				a_type = S_IFMT(a_stat[ST_MODE])
! 				b_type = S_IFMT(b_stat[ST_MODE])
! 				if a_type <> b_type:
! 					self.common_funny.append(x)
! 				elif S_ISDIR(a_type):
! 					self.common_dirs.append(x)
! 				elif S_ISREG(a_type):
! 					self.common_files.append(x)
! 				else:
! 					self.common_funny.append(x)
! 			else:
! 				self.common_funny.append(x)
! 	#
! 	def phase3(self): # Find out differences between common files
! 		xx = cmpfiles(self.a, self.b, self.common_files)
! 		self.same_files, self.diff_files, self.funny_files = xx
! 	#
! 	def phase4(self): # Find out differences between common subdirectories
! 		# A new dircmp object is created for each common subdirectory,
! 		# these are stored in a dictionary indexed by filename.
! 		# The hide and ignore properties are inherited from the parent
! 		self.subdirs = {}
! 		for x in self.common_dirs:
! 			a_x = os.path.join(self.a, x)
! 			b_x = os.path.join(self.b, x)
! 			self.subdirs[x] = newdd = dircmp().new(a_x, b_x)
! 			newdd.hide = self.hide
! 			newdd.ignore = self.ignore
! 			newdd.run()
! 	#
! 	def phase4_closure(self): # Recursively call phase4() on subdirectories
! 		self.phase4()
! 		for x in self.subdirs.keys():
! 			self.subdirs[x].phase4_closure()
! 	#
! 	def report(self): # Print a report on the differences between a and b
! 		# Assume that phases 1 to 3 have been executed
! 		# Output format is purposely lousy
! 		print 'diff', self.a, self.b
! 		if self.a_only:
! 			print 'Only in', self.a, ':', self.a_only
! 		if self.b_only:
! 			print 'Only in', self.b, ':', self.b_only
! 		if self.same_files:
! 			print 'Identical files :', self.same_files
! 		if self.diff_files:
! 			print 'Differing files :', self.diff_files
! 		if self.funny_files:
! 			print 'Trouble with common files :', self.funny_files
! 		if self.common_dirs:
! 			print 'Common subdirectories :', self.common_dirs
! 		if self.common_funny:
! 			print 'Common funny cases :', self.common_funny
! 	#
! 	def report_closure(self): # Print reports on self and on subdirs
! 		# If phase 4 hasn't been done, no subdir reports are printed
! 		self.report()
! 		try:
! 			x = self.subdirs
! 		except AttributeError:
! 			return # No subdirectories computed
! 		for x in self.subdirs.keys():
! 			print
! 			self.subdirs[x].report_closure()
! 	#
! 	def report_phase4_closure(self): # Report and do phase 4 recursively
! 		self.report()
! 		self.phase4()
! 		for x in self.subdirs.keys():
! 			print
! 			self.subdirs[x].report_phase4_closure()
! 
! 
! # Compare common files in two directories.
! # Return:
! #	- files that compare equal
! #	- files that compare different
! #	- funny cases (can't stat etc.)
! #
  def cmpfiles(a, b, common):
! 	res = ([], [], [])
! 	for x in common:
! 		res[cmp(os.path.join(a, x), os.path.join(b, x))].append(x)
! 	return res
  
  
- # Compare two files.
- # Return:
- #	0 for equal
- #	1 for different
- #	2 for funny cases (can't stat, etc.)
- #
  def cmp(a, b):
! 	try:
! 		if cmpcache.cmp(a, b): return 0
! 		return 1
! 	except os.error:
! 		return 2
! 
! 
! # Remove a list item.
! # NB: This modifies the list argument.
! #
! def remove(list, item):
! 	for i in range(len(list)):
! 		if list[i] == item:
! 			del list[i]
! 			break
  
  
- # Return a copy with items that occur in skip removed.
- #
  def filter(list, skip):
! 	result = []
! 	for item in list:
! 		if item not in skip: result.append(item)
! 	return result
  
  
! # Demonstration and testing.
! #
  def demo():
! 	import sys
! 	import getopt
! 	options, args = getopt.getopt(sys.argv[1:], 'r')
! 	if len(args) <> 2: raise getopt.error, 'need exactly two args'
! 	dd = dircmp().new(args[0], args[1])
! 	dd.run()
! 	if ('-r', '') in options:
! 		dd.report_phase4_closure()
! 	else:
! 		dd.report()
  
! # demo()
--- 8,201 ----
  from stat import *
  
  class dircmp:
!     """Directory comparison class."""
! 
!     def new(self, a, b):
!         """Initialize."""
!         self.a = a
!         self.b = b
!         # Properties that caller may change before calling self.run():
!         self.hide = [os.curdir, os.pardir] # Names never to be shown
!         self.ignore = ['RCS', 'tags'] # Names ignored in comparison
! 
!         return self
! 
!     def run(self):
!         """Compare everything except common subdirectories."""
!         self.a_list = filter(dircache.listdir(self.a), self.hide)
!         self.b_list = filter(dircache.listdir(self.b), self.hide)
!         self.a_list.sort()
!         self.b_list.sort()
!         self.phase1()
!         self.phase2()
!         self.phase3()
! 
!     def phase1(self):
!         """Compute common names."""
!         self.a_only = []
!         self.common = []
!         for x in self.a_list:
!             if x in self.b_list:
!                 self.common.append(x)
!             else:
!                 self.a_only.append(x)
! 
!         self.b_only = []
!         for x in self.b_list:
!             if x not in self.common:
!                 self.b_only.append(x)
! 
!     def phase2(self):
!         """Distinguish files, directories, funnies."""
!         self.common_dirs = []
!         self.common_files = []
!         self.common_funny = []
! 
!         for x in self.common:
!             a_path = os.path.join(self.a, x)
!             b_path = os.path.join(self.b, x)
! 
!             ok = 1
!             try:
!                 a_stat = statcache.stat(a_path)
!             except os.error, why:
!                 # print 'Can\'t stat', a_path, ':', why[1]
!                 ok = 0
!             try:
!                 b_stat = statcache.stat(b_path)
!             except os.error, why:
!                 # print 'Can\'t stat', b_path, ':', why[1]
!                 ok = 0
! 
!             if ok:
!                 a_type = S_IFMT(a_stat[ST_MODE])
!                 b_type = S_IFMT(b_stat[ST_MODE])
!                 if a_type <> b_type:
!                     self.common_funny.append(x)
!                 elif S_ISDIR(a_type):
!                     self.common_dirs.append(x)
!                 elif S_ISREG(a_type):
!                     self.common_files.append(x)
!                 else:
!                     self.common_funny.append(x)
!             else:
!                 self.common_funny.append(x)
! 
!     def phase3(self):
!         """Find out differences between common files."""
!         xx = cmpfiles(self.a, self.b, self.common_files)
!         self.same_files, self.diff_files, self.funny_files = xx
! 
!     def phase4(self):
!         """Find out differences between common subdirectories.
!         A new dircmp object is created for each common subdirectory,
!         these are stored in a dictionary indexed by filename.
!         The hide and ignore properties are inherited from the parent."""
!         self.subdirs = {}
!         for x in self.common_dirs:
!             a_x = os.path.join(self.a, x)
!             b_x = os.path.join(self.b, x)
!             self.subdirs[x] = newdd = dircmp().new(a_x, b_x)
!             newdd.hide = self.hide
!             newdd.ignore = self.ignore
!             newdd.run()
! 
!     def phase4_closure(self):
!         """Recursively call phase4() on subdirectories."""
!         self.phase4()
!         for x in self.subdirs.keys():
!             self.subdirs[x].phase4_closure()
! 
!     def report(self):
!         """Print a report on the differences between a and b."""
!         # Assume that phases 1 to 3 have been executed
!         # Output format is purposely lousy
!         print 'diff', self.a, self.b
!         if self.a_only:
!             print 'Only in', self.a, ':', self.a_only
!         if self.b_only:
!             print 'Only in', self.b, ':', self.b_only
!         if self.same_files:
!             print 'Identical files :', self.same_files
!         if self.diff_files:
!             print 'Differing files :', self.diff_files
!         if self.funny_files:
!             print 'Trouble with common files :', self.funny_files
!         if self.common_dirs:
!             print 'Common subdirectories :', self.common_dirs
!         if self.common_funny:
!             print 'Common funny cases :', self.common_funny
! 
!     def report_closure(self):
!         """Print reports on self and on subdirs.
!         If phase 4 hasn't been done, no subdir reports are printed."""
!         self.report()
!         try:
!             x = self.subdirs
!         except AttributeError:
!             return # No subdirectories computed
!         for x in self.subdirs.keys():
!             print
!             self.subdirs[x].report_closure()
! 
!     def report_phase4_closure(self):
!         """Report and do phase 4 recursively."""
!         self.report()
!         self.phase4()
!         for x in self.subdirs.keys():
!             print
!             self.subdirs[x].report_phase4_closure()
! 
! 
  def cmpfiles(a, b, common):
!     """Compare common files in two directories.
!     Return:
!         - files that compare equal
!         - files that compare different
!         - funny cases (can't stat etc.)"""
! 
!     res = ([], [], [])
!     for x in common:
!         res[cmp(os.path.join(a, x), os.path.join(b, x))].append(x)
!     return res
  
  
  def cmp(a, b):
!     """Compare two files.
!     Return:
!         0 for equal
!         1 for different
!         2 for funny cases (can't stat, etc.)"""
! 
!     try:
!         if cmpcache.cmp(a, b): return 0
!         return 1
!     except os.error:
!         return 2
  
  
  def filter(list, skip):
!     """Return a copy with items that occur in skip removed."""
  
+     result = []
+     for item in list:
+         if item not in skip: result.append(item)
+     return result
  
! 
  def demo():
!     """Demonstration and testing."""
! 
!     import sys
!     import getopt
!     options, args = getopt.getopt(sys.argv[1:], 'r')
!     if len(args) <> 2: raise getopt.error, 'need exactly two args'
!     dd = dircmp().new(args[0], args[1])
!     dd.run()
!     if ('-r', '') in options:
!         dd.report_phase4_closure()
!     else:
!         dd.report()
  
! if __name__ == "__main__":
!     demo()

Index: dircache.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/dircache.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dircache.py	1992/03/31 18:55:14	1.4
--- dircache.py	2000/02/02 15:10:14	1.5
***************
*** 1,7 ****
! # Module 'dircache'
! #
! # Return a sorted list of the files in a directory, using a cache
! # to avoid reading the directory more often than necessary.
! # Also contains a subroutine to append slashes to directories.
  
  import os
--- 1,5 ----
! """Return a sorted list of the files in a directory, using a cache
! to avoid reading the directory more often than necessary.
! Also contains a subroutine to append slashes to directories."""
  
  import os
***************
*** 9,35 ****
  cache = {}
  
! def listdir(path): # List directory contents, using cache
! 	try:
! 		cached_mtime, list = cache[path]
! 		del cache[path]
! 	except KeyError:
! 		cached_mtime, list = -1, []
! 	try:
! 		mtime = os.stat(path)[8]
! 	except os.error:
! 		return []
! 	if mtime <> cached_mtime:
! 		try:
! 			list = os.listdir(path)
! 		except os.error:
! 			return []
! 		list.sort()
! 	cache[path] = mtime, list
! 	return list
  
  opendir = listdir # XXX backward compatibility
  
! def annotate(head, list): # Add '/' suffixes to directories
! 	for i in range(len(list)):
! 		if os.path.isdir(os.path.join(head, list[i])):
! 			list[i] = list[i] + '/'
--- 7,35 ----
  cache = {}
  
! def listdir(path):
!     """List directory contents, using cache."""
!     try:
!         cached_mtime, list = cache[path]
!         del cache[path]
!     except KeyError:
!         cached_mtime, list = -1, []
!     try:
!         mtime = os.stat(path)[8]
!     except os.error:
!         return []
!     if mtime <> cached_mtime:
!         try:
!             list = os.listdir(path)
!         except os.error:
!             return []
!         list.sort()
!     cache[path] = mtime, list
!     return list
  
  opendir = listdir # XXX backward compatibility
  
! def annotate(head, list):
!     """Add '/' suffixes to directories."""
!     for i in range(len(list)):
!         if os.path.isdir(os.path.join(head, list[i])):
!             list[i] = list[i] + '/'

Index: cmpcache.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/cmpcache.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** cmpcache.py	1999/06/25 14:21:44	1.7
--- cmpcache.py	2000/02/02 15:10:14	1.8
***************
*** 1,12 ****
! # Module 'cmpcache'
! #
! # Efficiently compare files, boolean outcome only (equal / not equal).
! #
! # Tricks (used in this order):
! #	- Use the statcache module to avoid statting files more than once
! #	- Files with identical type, size & mtime are assumed to be clones
! #	- Files with different type or size cannot be identical
! #	- We keep a cache of outcomes of earlier comparisons
! #	- We don't fork a process to run 'cmp' but read the files ourselves
  
  import os
--- 1,11 ----
! """Efficiently compare files, boolean outcome only (equal / not equal).
! 
! Tricks (used in this order):
!     - Use the statcache module to avoid statting files more than once
!     - Files with identical type, size & mtime are assumed to be clones
!     - Files with different type or size cannot be identical
!     - We keep a cache of outcomes of earlier comparisons
!     - We don't fork a process to run 'cmp' but read the files ourselves
! """
  
  import os
***************
*** 20,68 ****
  
  
- # Compare two files, use the cache if possible.
- # May raise os.error if a stat or open of either fails.
- #
  def cmp(f1, f2, shallow=1):
! 	# Return 1 for identical files, 0 for different.
! 	# Raise exceptions if either file could not be statted, read, etc.
! 	s1, s2 = sig(statcache.stat(f1)), sig(statcache.stat(f2))
! 	if not S_ISREG(s1[0]) or not S_ISREG(s2[0]):
! 		# Either is a not a plain file -- always report as different
! 		return 0
! 	if shallow and s1 == s2:
! 		# type, size & mtime match -- report same
! 		return 1
! 	if s1[:2] <> s2[:2]: # Types or sizes differ, don't bother
! 		# types or sizes differ -- report different
! 		return 0
! 	# same type and size -- look in the cache
! 	key = f1 + ' ' + f2
! 	if cache.has_key(key):
! 		cs1, cs2, outcome = cache[key]
! 		# cache hit
! 		if s1 == cs1 and s2 == cs2:
! 			# cached signatures match
! 			return outcome
! 		# stale cached signature(s)
! 	# really compare
! 	outcome = do_cmp(f1, f2)
! 	cache[key] = s1, s2, outcome
! 	return outcome
  
- # Return signature (i.e., type, size, mtime) from raw stat data.
- #
  def sig(st):
! 	return S_IFMT(st[ST_MODE]), st[ST_SIZE], st[ST_MTIME]
  
- # Compare two files, really.
- #
  def do_cmp(f1, f2):
! 	#print '    cmp', f1, f2 # XXX remove when debugged
! 	bufsize = 8*1024 # Could be tuned
! 	fp1 = open(f1, 'rb')
! 	fp2 = open(f2, 'rb')
! 	while 1:
! 		b1 = fp1.read(bufsize)
! 		b2 = fp2.read(bufsize)
! 		if b1 <> b2: return 0
! 		if not b1: return 1
--- 19,64 ----
  
  
  def cmp(f1, f2, shallow=1):
!     """Compare two files, use the cache if possible.
!     May raise os.error if a stat or open of either fails.
!     Return 1 for identical files, 0 for different.
!     Raise exceptions if either file could not be statted, read, etc."""
!     s1, s2 = sig(statcache.stat(f1)), sig(statcache.stat(f2))
!     if not S_ISREG(s1[0]) or not S_ISREG(s2[0]):
!         # Either is a not a plain file -- always report as different
!         return 0
!     if shallow and s1 == s2:
!         # type, size & mtime match -- report same
!         return 1
!     if s1[:2] <> s2[:2]: # Types or sizes differ, don't bother
!         # types or sizes differ -- report different
!         return 0
!     # same type and size -- look in the cache
!     key = f1 + ' ' + f2
!     if cache.has_key(key):
!         cs1, cs2, outcome = cache[key]
!         # cache hit
!         if s1 == cs1 and s2 == cs2:
!             # cached signatures match
!             return outcome
!         # stale cached signature(s)
!     # really compare
!     outcome = do_cmp(f1, f2)
!     cache[key] = s1, s2, outcome
!     return outcome
  
  def sig(st):
!     """Return signature (i.e., type, size, mtime) from raw stat data."""
!     return S_IFMT(st[ST_MODE]), st[ST_SIZE], st[ST_MTIME]
  
  def do_cmp(f1, f2):
!     """Compare two files, really."""
!     #print '    cmp', f1, f2 # XXX remove when debugged
!     bufsize = 8*1024 # Could be tuned
!     fp1 = open(f1, 'rb')
!     fp2 = open(f2, 'rb')
!     while 1:
!         b1 = fp1.read(bufsize)
!         b2 = fp2.read(bufsize)
!         if b1 <> b2: return 0
!         if not b1: return 1

Index: cmp.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/cmp.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** cmp.py	1999/06/25 14:12:50	1.7
--- cmp.py	2000/02/02 15:10:14	1.8
***************
*** 1,61 ****
! # Module 'cmp'
  
! # Efficiently compare files, boolean outcome only (equal / not equal).
  
- # Tricks (used in this order):
- #	- Files with identical type, size & mtime are assumed to be clones
- #	- Files with different type or size cannot be identical
- #	- We keep a cache of outcomes of earlier comparisons
- #	- We don't fork a process to run 'cmp' but read the files ourselves
- 
  import os
  
  cache = {}
  
! def cmp(f1, f2, shallow=1): # Compare two files, use the cache if possible.
! 	# Return 1 for identical files, 0 for different.
! 	# Raise exceptions if either file could not be statted, read, etc.
! 	s1, s2 = sig(os.stat(f1)), sig(os.stat(f2))
! 	if s1[0] <> 8 or s2[0] <> 8:
! 		# Either is a not a plain file -- always report as different
! 		return 0
! 	if shallow and s1 == s2:
! 		# type, size & mtime match -- report same
! 		return 1
! 	if s1[:2] <> s2[:2]: # Types or sizes differ, don't bother
! 		# types or sizes differ -- report different
! 		return 0
! 	# same type and size -- look in the cache
! 	key = (f1, f2)
! 	try:
! 		cs1, cs2, outcome = cache[key]
! 		# cache hit
! 		if s1 == cs1 and s2 == cs2:
! 			# cached signatures match
! 			return outcome
! 		# stale cached signature(s)
! 	except KeyError:
! 		# cache miss
! 		pass
! 	# really compare
! 	outcome = do_cmp(f1, f2)
! 	cache[key] = s1, s2, outcome
! 	return outcome
! 
! def sig(st): # Return signature (i.e., type, size, mtime) from raw stat data
! 	# 0-5: st_mode, st_ino, st_dev, st_nlink, st_uid, st_gid
! 	# 6-9: st_size, st_atime, st_mtime, st_ctime
! 	type = st[0] / 4096
! 	size = st[6]
! 	mtime = st[8]
! 	return type, size, mtime
! 
! def do_cmp(f1, f2): # Compare two files, really
! 	bufsize = 8*1024 # Could be tuned
! 	fp1 = open(f1, 'rb')
! 	fp2 = open(f2, 'rb')
! 	while 1:
! 		b1 = fp1.read(bufsize)
! 		b2 = fp2.read(bufsize)
! 		if b1 <> b2: return 0
! 		if not b1: return 1
--- 1,63 ----
! """Efficiently compare files, boolean outcome only (equal / not equal).
  
! Tricks (used in this order):
!     - Files with identical type, size & mtime are assumed to be clones
!     - Files with different type or size cannot be identical
!     - We keep a cache of outcomes of earlier comparisons
!     - We don't fork a process to run 'cmp' but read the files ourselves
! """
  
  import os
  
  cache = {}
  
! def cmp(f1, f2, shallow=1):
!     """Compare two files, use the cache if possible.
!     Return 1 for identical files, 0 for different.
!     Raise exceptions if either file could not be statted, read, etc."""
!     s1, s2 = sig(os.stat(f1)), sig(os.stat(f2))
!     if s1[0] <> 8 or s2[0] <> 8:
!         # Either is a not a plain file -- always report as different
!         return 0
!     if shallow and s1 == s2:
!         # type, size & mtime match -- report same
!         return 1
!     if s1[:2] <> s2[:2]: # Types or sizes differ, don't bother
!         # types or sizes differ -- report different
!         return 0
!     # same type and size -- look in the cache
!     key = (f1, f2)
!     try:
!         cs1, cs2, outcome = cache[key]
!         # cache hit
!         if s1 == cs1 and s2 == cs2:
!             # cached signatures match
!             return outcome
!         # stale cached signature(s)
!     except KeyError:
!         # cache miss
!         pass
!     # really compare
!     outcome = do_cmp(f1, f2)
!     cache[key] = s1, s2, outcome
!     return outcome
! 
! def sig(st):
!     """Return signature (i.e., type, size, mtime) from raw stat data
!     0-5: st_mode, st_ino, st_dev, st_nlink, st_uid, st_gid
!     6-9: st_size, st_atime, st_mtime, st_ctime"""
!     type = st[0] / 4096
!     size = st[6]
!     mtime = st[8]
!     return type, size, mtime
! 
! def do_cmp(f1, f2):
!     """Compare two files, really."""
!     bufsize = 8*1024 # Could be tuned
!     fp1 = open(f1, 'rb')
!     fp2 = open(f2, 'rb')
!     while 1:
!         b1 = fp1.read(bufsize)
!         b2 = fp2.read(bufsize)
!         if b1 <> b2: return 0
!         if not b1: return 1

Index: cmd.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/cmd.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** cmd.py	1999/05/03 18:08:16	1.16
--- cmd.py	2000/02/02 15:10:14	1.17
***************
*** 1,39 ****
! # A generic class to build line-oriented command interpreters
! #
! # Interpreters constructed with this class obey the following conventions:
! #
! # 1. End of file on input is processed as the command 'EOF'.
! # 2. A command is parsed out of each line by collecting the prefix composed
! #    of characters in the identchars member.
! # 3. A command `foo' is dispatched to a method 'do_foo()'; the do_ method
! #    is passed a single argument consisting of the remainder of the line.
! # 4. Typing an empty line repeats the last command.  (Actually, it calls the
! #    method `emptyline', which may be overridden in a subclass.)
! # 5. There is a predefined `help' method.  Given an argument `topic', it
! #    calls the command `help_topic'.  With no arguments, it lists all topics
! #    with defined help_ functions, broken into up to three topics; documented
! #    commands, miscellaneous help topics, and undocumented commands.
! # 6. The command '?' is a synonym for `help'.  The command '!' is a synonym
! #    for `shell', if a do_shell method exists.
! #
! # The `default' method may be overridden to intercept commands for which there
! # is no do_ method.
! #
! # The data member `self.ruler' sets the character used to draw separator lines
! # in the help messages.  If empty, no ruler line is drawn.  It defaults to "=".
! #
! # If the value of `self.intro' is nonempty when the cmdloop method is called,
! # it is printed out on interpreter startup.  This value may be overridden
! # via an optional argument to the cmdloop() method.
! #
! # The data members `self.doc_header', `self.misc_header', and
! # `self.undoc_header' set the headers used for the help function's
! # listings of documented functions, miscellaneous topics, and undocumented
! # functions respectively.
! #
! # These interpreters use raw_input; thus, if the readline module is loaded,
! # they automatically support Emacs-like command history and editing features.
! #
  
  import string
  
--- 1,39 ----
! """A generic class to build line-oriented command interpreters.
  
+ Interpreters constructed with this class obey the following conventions:
+ 
+ 1. End of file on input is processed as the command 'EOF'.
+ 2. A command is parsed out of each line by collecting the prefix composed
+    of characters in the identchars member.
+ 3. A command `foo' is dispatched to a method 'do_foo()'; the do_ method
+    is passed a single argument consisting of the remainder of the line.
+ 4. Typing an empty line repeats the last command.  (Actually, it calls the
+    method `emptyline', which may be overridden in a subclass.)
+ 5. There is a predefined `help' method.  Given an argument `topic', it
+    calls the command `help_topic'.  With no arguments, it lists all topics
+    with defined help_ functions, broken into up to three topics; documented
+    commands, miscellaneous help topics, and undocumented commands.
+ 6. The command '?' is a synonym for `help'.  The command '!' is a synonym
+    for `shell', if a do_shell method exists.
+ 
+ The `default' method may be overridden to intercept commands for which there
+ is no do_ method.
+ 
+ The data member `self.ruler' sets the character used to draw separator lines
+ in the help messages.  If empty, no ruler line is drawn.  It defaults to "=".
+ 
+ If the value of `self.intro' is nonempty when the cmdloop method is called,
+ it is printed out on interpreter startup.  This value may be overridden
+ via an optional argument to the cmdloop() method.
+ 
+ The data members `self.doc_header', `self.misc_header', and
+ `self.undoc_header' set the headers used for the help function's
+ listings of documented functions, miscellaneous topics, and undocumented
+ functions respectively.
+ 
+ These interpreters use raw_input; thus, if the readline module is loaded,
+ they automatically support Emacs-like command history and editing features.
+ """
+ 
  import string
  
***************
*** 42,187 ****
  
  class Cmd:
! 	prompt = PROMPT
! 	identchars = IDENTCHARS
! 	ruler = '='
! 	lastcmd = ''
! 	cmdqueue = []
! 	intro = None
! 	doc_leader = ""
! 	doc_header = "Documented commands (type help <topic>):"
! 	misc_header = "Miscellaneous help topics:"
! 	undoc_header = "Undocumented commands:"
! 	nohelp = "*** No help on %s"
! 
! 	def __init__(self): pass
! 
! 	def cmdloop(self, intro=None):
! 		self.preloop()
! 		if intro != None:
! 			self.intro = intro
! 		if self.intro:
! 			print self.intro
! 		stop = None
! 		while not stop:
! 			if self.cmdqueue:
! 				line = self.cmdqueue[0]
! 				del self.cmdqueue[0]
! 			else:
! 				try:
! 					line = raw_input(self.prompt)
! 				except EOFError:
! 					line = 'EOF'
! 			line = self.precmd(line)
! 			stop = self.onecmd(line)
! 			stop = self.postcmd(stop, line)
! 		self.postloop()
! 
! 	def precmd(self, line):
! 		return line
! 
! 	def postcmd(self, stop, line):
! 		return stop
! 
! 	def preloop(self):
! 		pass
! 
! 	def postloop(self):
! 		pass
! 
! 	def onecmd(self, line):
! 		line = string.strip(line)
! 		if line == '?':
! 			line = 'help'
! 		elif line == '!':
! 			if hasattr(self, 'do_shell'):
! 				line = 'shell'
! 			else:
! 				return self.default(line)
! 		elif not line:
! 			return self.emptyline()
! 		self.lastcmd = line
! 		i, n = 0, len(line)
! 		while i < n and line[i] in self.identchars: i = i+1
! 		cmd, arg = line[:i], string.strip(line[i:])
! 		if cmd == '':
! 			return self.default(line)
! 		else:
! 			try:
! 				func = getattr(self, 'do_' + cmd)
! 			except AttributeError:
! 				return self.default(line)
! 			return func(arg)
! 
! 	def emptyline(self):
! 		if self.lastcmd:
! 			return self.onecmd(self.lastcmd)
! 
! 	def default(self, line):
! 		print '*** Unknown syntax:', line
! 
! 	def do_help(self, arg):
! 		if arg:
! 			# XXX check arg syntax
! 			try:
! 				func = getattr(self, 'help_' + arg)
! 			except:
! 				try:
! 					doc=getattr(self, 'do_' + arg).__doc__
! 					if doc:
! 						print doc
! 						return
! 				except:
! 					pass
! 				print self.nohelp % (arg,)
! 				return
! 			func()
! 		else:
! 			# Inheritance says we have to look in class and
! 			# base classes; order is not important.
! 			names = []
! 			classes = [self.__class__]
! 			while classes:
! 				aclass = classes[0]
! 				if aclass.__bases__:
! 				    classes = classes + list(aclass.__bases__)
! 				names = names + dir(aclass)
! 				del classes[0]
! 			cmds_doc = []
! 			cmds_undoc = []
! 			help = {}
! 			for name in names:
! 				if name[:5] == 'help_':
! 					help[name[5:]]=1
! 			names.sort()
! 			# There can be duplicates if routines overridden
! 			prevname = ''
! 			for name in names:
! 				if name[:3] == 'do_':
! 					if name == prevname:
! 						continue
! 					prevname = name
! 					cmd=name[3:]
! 					if help.has_key(cmd):
! 						cmds_doc.append(cmd)
! 						del help[cmd]
! 					elif getattr(self, name).__doc__:
! 						cmds_doc.append(cmd)
! 					else:
! 						cmds_undoc.append(cmd)
! 			print self.doc_leader
! 			self.print_topics(self.doc_header,   cmds_doc,   15,80)
! 			self.print_topics(self.misc_header,  help.keys(),15,80)
! 			self.print_topics(self.undoc_header, cmds_undoc, 15,80)
! 
! 	def print_topics(self, header, cmds, cmdlen, maxcol):
! 		if cmds:
! 			print header;
! 			if self.ruler:
! 			    print self.ruler * len(header)
! 			(cmds_per_line,junk)=divmod(maxcol,cmdlen)
! 			col=cmds_per_line
! 			for cmd in cmds:
! 				if col==0: print
! 				print (("%-"+`cmdlen`+"s") % cmd),
! 				col = (col+1) % cmds_per_line
! 			print "\n"
--- 42,187 ----
  
  class Cmd:
!     prompt = PROMPT
!     identchars = IDENTCHARS
!     ruler = '='
!     lastcmd = ''
!     cmdqueue = []
!     intro = None
!     doc_leader = ""
!     doc_header = "Documented commands (type help <topic>):"
!     misc_header = "Miscellaneous help topics:"
!     undoc_header = "Undocumented commands:"
!     nohelp = "*** No help on %s"
! 
!     def __init__(self): pass
! 
!     def cmdloop(self, intro=None):
!         self.preloop()
!         if intro != None:
!             self.intro = intro
!         if self.intro:
!             print self.intro
!         stop = None
!         while not stop:
!             if self.cmdqueue:
!                 line = self.cmdqueue[0]
!                 del self.cmdqueue[0]
!             else:
!                 try:
!                     line = raw_input(self.prompt)
!                 except EOFError:
!                     line = 'EOF'
!             line = self.precmd(line)
!             stop = self.onecmd(line)
!             stop = self.postcmd(stop, line)
!         self.postloop()
! 
!     def precmd(self, line):
!         return line
! 
!     def postcmd(self, stop, line):
!         return stop
! 
!     def preloop(self):
!         pass
! 
!     def postloop(self):
!         pass
! 
!     def onecmd(self, line):
!         line = string.strip(line)
!         if line == '?':
!             line = 'help'
!         elif line == '!':
!             if hasattr(self, 'do_shell'):
!                 line = 'shell'
!             else:
!                 return self.default(line)
!         elif not line:
!             return self.emptyline()
!         self.lastcmd = line
!         i, n = 0, len(line)
!         while i < n and line[i] in self.identchars: i = i+1
!         cmd, arg = line[:i], string.strip(line[i:])
!         if cmd == '':
!             return self.default(line)
!         else:
!             try:
!                 func = getattr(self, 'do_' + cmd)
!             except AttributeError:
!                 return self.default(line)
!             return func(arg)
! 
!     def emptyline(self):
!         if self.lastcmd:
!             return self.onecmd(self.lastcmd)
! 
!     def default(self, line):
!         print '*** Unknown syntax:', line
! 
!     def do_help(self, arg):
!         if arg:
!             # XXX check arg syntax
!             try:
!                 func = getattr(self, 'help_' + arg)
!             except:
!                 try:
!                     doc=getattr(self, 'do_' + arg).__doc__
!                     if doc:
!                         print doc
!                         return
!                 except:
!                     pass
!                 print self.nohelp % (arg,)
!                 return
!             func()
!         else:
!             # Inheritance says we have to look in class and
!             # base classes; order is not important.
!             names = []
!             classes = [self.__class__]
!             while classes:
!                 aclass = classes[0]
!                 if aclass.__bases__:
!                     classes = classes + list(aclass.__bases__)
!                 names = names + dir(aclass)
!                 del classes[0]
!             cmds_doc = []
!             cmds_undoc = []
!             help = {}
!             for name in names:
!                 if name[:5] == 'help_':
!                     help[name[5:]]=1
!             names.sort()
!             # There can be duplicates if routines overridden
!             prevname = ''
!             for name in names:
!                 if name[:3] == 'do_':
!                     if name == prevname:
!                         continue
!                     prevname = name
!                     cmd=name[3:]
!                     if help.has_key(cmd):
!                         cmds_doc.append(cmd)
!                         del help[cmd]
!                     elif getattr(self, name).__doc__:
!                         cmds_doc.append(cmd)
!                     else:
!                         cmds_undoc.append(cmd)
!             print self.doc_leader
!             self.print_topics(self.doc_header,   cmds_doc,   15,80)
!             self.print_topics(self.misc_header,  help.keys(),15,80)
!             self.print_topics(self.undoc_header, cmds_undoc, 15,80)
! 
!     def print_topics(self, header, cmds, cmdlen, maxcol):
!         if cmds:
!             print header;
!             if self.ruler:
!                 print self.ruler * len(header)
!             (cmds_per_line,junk)=divmod(maxcol,cmdlen)
!             col=cmds_per_line
!             for cmd in cmds:
!                 if col==0: print
!                 print (("%-"+`cmdlen`+"s") % cmd),
!                 col = (col+1) % cmds_per_line
!             print "\n"

Index: calendar.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/calendar.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** calendar.py	1999/06/09 15:07:38	1.14
--- calendar.py	2000/02/02 15:10:14	1.15
***************
*** 1,5 ****
! ###############################
! # Calendar printing functions #
! ###############################
  
  # Revision 2: uses funtions from built-in time module
--- 1,3 ----
! """Calendar printing functions"""
  
  # Revision 2: uses funtions from built-in time module
***************
*** 23,170 ****
  
  # Full and abbreviated names of weekdays
! day_name = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', \
! 	    'Friday', 'Saturday', 'Sunday']
  day_abbr = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
  
  # Full and abbreviated names of months (1-based arrays!!!)
! month_name =          ['', 'January',   'February', 'March',    'April', \
! 		           'May',       'June',     'July',     'August', \
! 			   'September', 'October',  'November', 'December']
! month_abbr =       ['   ', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', \
! 		           'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
  
- # Return 1 for leap years, 0 for non-leap years
  def isleap(year):
! 	return year % 4 == 0 and (year % 100 <> 0 or year % 400 == 0)
  
- # Return number of leap years in range [y1, y2)
- # Assume y1 <= y2 and no funny (non-leap century) years
  def leapdays(y1, y2):
! 	return (y2+3)/4 - (y1+3)/4
  
- # Return weekday (0-6 ~ Mon-Sun) for year (1970-...), month (1-12), day (1-31)
  def weekday(year, month, day):
! 	secs = mktime((year, month, day, 0, 0, 0, 0, 0, 0))
! 	tuple = localtime(secs)
! 	return tuple[6]
  
- # Return weekday (0-6 ~ Mon-Sun) and number of days (28-31) for year, month
  def monthrange(year, month):
! 	if not 1 <= month <= 12: raise ValueError, 'bad month number'
! 	day1 = weekday(year, month, 1)
! 	ndays = mdays[month] + (month == February and isleap(year))
! 	return day1, ndays
  
- # Return a matrix representing a month's calendar
- # Each row represents a week; days outside this month are zero
  def _monthcalendar(year, month):
! 	day1, ndays = monthrange(year, month)
! 	rows = []
! 	r7 = range(7)
! 	day = 1 - day1
! 	while day <= ndays:
! 		row = [0, 0, 0, 0, 0, 0, 0]
! 		for i in r7:
! 			if 1 <= day <= ndays: row[i] = day
! 			day = day + 1
! 		rows.append(row)
! 	return rows
  
- # Caching interface to _monthcalendar
  _mc_cache = {}
  def monthcalendar(year, month):
! 	key = (year, month)
! 	if _mc_cache.has_key(key):
! 		return _mc_cache[key]
! 	else:
! 		_mc_cache[key] = ret = _monthcalendar(year, month)
! 		return ret
  
- # Center a string in a field
  def _center(str, width):
! 	n = width - len(str)
! 	if n <= 0: return str
! 	return ' '*((n+1)/2) + str + ' '*((n)/2)
  
  # XXX The following code knows that print separates items with space!
  
- # Print a single week (no newline)
  def prweek(week, width):
! 	for day in week:
! 		if day == 0: s = ''
! 		else: s = `day`
! 		print _center(s, width),
  
- # Return a header for a week
  def weekheader(width):
! 	str = ''
! 	if width >= 9: names = day_name
! 	else: names = day_abbr
! 	for i in range(7):
! 		if str: str = str + ' '
! 		str = str + _center(names[i%7][:width], width)
! 	return str
  
- # Print a month's calendar
  def prmonth(year, month, w = 0, l = 0):
! 	w = max(2, w)
! 	l = max(1, l)
! 	print _center(month_name[month] + ' ' + `year`, 7*(w+1) - 1),
! 	print '\n'*l,
! 	print weekheader(w),
! 	print '\n'*l,
! 	for week in monthcalendar(year, month):
! 		prweek(week, w)
! 		print '\n'*l,
  
  # Spacing of month columns
! _colwidth = 7*3 - 1			# Amount printed by prweek()
! _spacing = ' '*4			# Spaces between columns
  
- # 3-column formatting for year calendars
  def format3c(a, b, c):
! 	print _center(a, _colwidth),
! 	print _spacing,
! 	print _center(b, _colwidth),
! 	print _spacing,
! 	print _center(c, _colwidth)
  
- # Print a year's calendar
  def prcal(year):
! 	header = weekheader(2)
! 	format3c('', `year`, '')
! 	for q in range(January, January+12, 3):
! 		print
! 		format3c(month_name[q], month_name[q+1], month_name[q+2])
! 		format3c(header, header, header)
! 		data = []
! 		height = 0
! 		for month in range(q, q+3):
! 			cal = monthcalendar(year, month)
! 			if len(cal) > height: height = len(cal)
! 			data.append(cal)
! 		for i in range(height):
! 			for cal in data:
! 				if i >= len(cal):
! 					print ' '*_colwidth,
! 				else:
! 					prweek(cal[i], 2)
! 				print _spacing,
! 			print
  
- # Unrelated but handy function to calculate Unix timestamp from GMT
  EPOCH = 1970
  def timegm(tuple):
! 	year, month, day, hour, minute, second = tuple[:6]
! 	assert year >= EPOCH
! 	assert 1 <= month <= 12
! 	days = 365*(year-EPOCH) + leapdays(EPOCH, year)
! 	for i in range(1, month):
! 		days = days + mdays[i]
! 	if month > 2 and isleap(year):
! 		days = days + 1
! 	days = days + day - 1
! 	hours = days*24 + hour
! 	minutes = hours*60 + minute
! 	seconds = minutes*60 + second
! 	return seconds
--- 21,168 ----
  
  # Full and abbreviated names of weekdays
! day_name = ['Monday', 'Tuesday', 'Wednesday', 'Thursday',
!             'Friday', 'Saturday', 'Sunday']
  day_abbr = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
  
  # Full and abbreviated names of months (1-based arrays!!!)
! month_name = ['', 'January', 'February', 'March', 'April',
!               'May', 'June', 'July', 'August',
!               'September', 'October',  'November', 'December']
! month_abbr = ['   ', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
!               'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
  
  def isleap(year):
!     """Return 1 for leap years, 0 for non-leap years."""
!     return year % 4 == 0 and (year % 100 <> 0 or year % 400 == 0)
  
  def leapdays(y1, y2):
!     """Return number of leap years in range [y1, y2).
!     Assume y1 <= y2 and no funny (non-leap century) years."""
!     return (y2+3)/4 - (y1+3)/4
  
  def weekday(year, month, day):
!     """Return weekday (0-6 ~ Mon-Sun) for year (1970-...), month (1-12), day (1-31)."""
!     secs = mktime((year, month, day, 0, 0, 0, 0, 0, 0))
!     tuple = localtime(secs)
!     return tuple[6]
  
  def monthrange(year, month):
!     """Return weekday (0-6 ~ Mon-Sun) and number of days (28-31) for year, month."""
!     if not 1 <= month <= 12: raise ValueError, 'bad month number'
!     day1 = weekday(year, month, 1)
!     ndays = mdays[month] + (month == February and isleap(year))
!     return day1, ndays
  
  def _monthcalendar(year, month):
!     """Return a matrix representing a month's calendar.
!     Each row represents a week; days outside this month are zero."""
!     day1, ndays = monthrange(year, month)
!     rows = []
!     r7 = range(7)
!     day = 1 - day1
!     while day <= ndays:
!         row = [0, 0, 0, 0, 0, 0, 0]
!         for i in r7:
!             if 1 <= day <= ndays: row[i] = day
!             day = day + 1
!         rows.append(row)
!     return rows
  
  _mc_cache = {}
  def monthcalendar(year, month):
!     """Caching interface to _monthcalendar."""
!     key = (year, month)
!     if _mc_cache.has_key(key):
!         return _mc_cache[key]
!     else:
!         _mc_cache[key] = ret = _monthcalendar(year, month)
!         return ret
  
  def _center(str, width):
!     """Center a string in a field."""
!     n = width - len(str)
!     if n <= 0: return str
!     return ' '*((n+1)/2) + str + ' '*((n)/2)
  
  # XXX The following code knows that print separates items with space!
  
  def prweek(week, width):
!     """Print a single week (no newline)."""
!     for day in week:
!         if day == 0: s = ''
!         else: s = `day`
!         print _center(s, width),
  
  def weekheader(width):
!     """Return a header for a week."""
!     str = ''
!     if width >= 9: names = day_name
!     else: names = day_abbr
!     for i in range(7):
!         if str: str = str + ' '
!         str = str + _center(names[i%7][:width], width)
!     return str
  
  def prmonth(year, month, w = 0, l = 0):
!     """Print a month's calendar."""
!     w = max(2, w)
!     l = max(1, l)
!     print _center(month_name[month] + ' ' + `year`, 7*(w+1) - 1),
!     print '\n'*l,
!     print weekheader(w),
!     print '\n'*l,
!     for week in monthcalendar(year, month):
!         prweek(week, w)
!         print '\n'*l,
  
  # Spacing of month columns
! _colwidth = 7*3 - 1         # Amount printed by prweek()
! _spacing = ' '*4            # Spaces between columns
  
  def format3c(a, b, c):
!     """3-column formatting for year calendars"""
!     print _center(a, _colwidth),
!     print _spacing,
!     print _center(b, _colwidth),
!     print _spacing,
!     print _center(c, _colwidth)
  
  def prcal(year):
!     """Print a year's calendar."""
!     header = weekheader(2)
!     format3c('', `year`, '')
!     for q in range(January, January+12, 3):
!         print
!         format3c(month_name[q], month_name[q+1], month_name[q+2])
!         format3c(header, header, header)
!         data = []
!         height = 0
!         for month in range(q, q+3):
!             cal = monthcalendar(year, month)
!             if len(cal) > height: height = len(cal)
!             data.append(cal)
!         for i in range(height):
!             for cal in data:
!                 if i >= len(cal):
!                     print ' '*_colwidth,
!                 else:
!                     prweek(cal[i], 2)
!                 print _spacing,
!             print
  
  EPOCH = 1970
  def timegm(tuple):
!     """Unrelated but handy function to calculate Unix timestamp from GMT."""
!     year, month, day, hour, minute, second = tuple[:6]
!     assert year >= EPOCH
!     assert 1 <= month <= 12
!     days = 365*(year-EPOCH) + leapdays(EPOCH, year)
!     for i in range(1, month):
!         days = days + mdays[i]
!     if month > 2 and isleap(year):
!         days = days + 1
!     days = days + day - 1
!     hours = days*24 + hour
!     minutes = hours*60 + minute
!     seconds = minutes*60 + second
!     return seconds

Index: binhex.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/binhex.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** binhex.py	1998/03/26 20:34:13	1.10
--- binhex.py	2000/02/02 15:10:14	1.11
***************
*** 1,3 ****
--- 1,4 ----
  """binhex - Macintosh binhex compression/decompression
+ 
  easy interface:
  binhex(inputfilename, outputfilename)
***************
*** 26,30 ****
  import string
  import binascii
! 	
[...982 lines suppressed...]
!         nfinfo.Flags = finfo.Flags
!         ofss.SetFInfo(nfinfo)
!     
!     ifp.close()
  
  def _test():
!     if os.name == 'mac':
!         fss, ok = macfs.PromptGetFile('File to convert:')
!         if not ok:
!             sys.exit(0)
!         fname = fss.as_pathname()
!     else:
!         fname = sys.argv[1]
!     binhex(fname, fname+'.hqx')
!     hexbin(fname+'.hqx', fname+'.viahqx')
!     #hexbin(fname, fname+'.unpacked')
!     sys.exit(1)
!     
  if __name__ == '__main__':
!     _test()

Index: bdb.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/bdb.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** bdb.py	2000/01/19 21:57:30	1.26
--- bdb.py	2000/02/02 15:10:14	1.27
***************
*** 1,3 ****
! # Debugger basics
  
  import sys
--- 1,3 ----
! """Debugger basics"""
  
  import sys
***************
*** 9,474 ****
  
[...1079 lines suppressed...]
!         line = linecache.getline(fn, frame.f_lineno)
!         print '+++', fn, frame.f_lineno, name, ':', string.strip(line)
!     def user_return(self, frame, retval):
!         print '+++ return', retval
!     def user_exception(self, frame, exc_stuff):
!         print '+++ exception', exc_stuff
!         self.set_continue()
  
  def foo(n):
!     print 'foo(', n, ')'
!     x = bar(n*10)
!     print 'bar returned', x
  
  def bar(a):
!     print 'bar(', a, ')'
!     return a/2
  
  def test():
!     t = Tdb()
!     t.run('import bdb; bdb.foo(10)')

Index: base64.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/base64.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** base64.py	2000/01/03 15:44:40	1.8
--- base64.py	2000/02/02 15:10:14	1.9
***************
*** 1,6 ****
  #! /usr/bin/env python
  
! # Conversions to/from base64 transport encoding as per RFC-1521.
! #
  # Modified 04-Oct-95 by Jack to use binascii module
  
--- 1,6 ----
  #! /usr/bin/env python
  
! """Conversions to/from base64 transport encoding as per RFC-1521."""
! 
  # Modified 04-Oct-95 by Jack to use binascii module
  
***************
*** 10,77 ****
  MAXBINSIZE = (MAXLINESIZE/4)*3
  
- # Encode a file.
  def encode(input, output):
! 	while 1:
! 		s = input.read(MAXBINSIZE)
! 		if not s: break
! 		while len(s) < MAXBINSIZE:
! 		    ns = input.read(MAXBINSIZE-len(s))
! 		    if not ns: break
! 		    s = s + ns
! 		line = binascii.b2a_base64(s)
! 		output.write(line)
  
- # Decode a file.
  def decode(input, output):
! 	while 1:
! 		line = input.readline()
! 		if not line: break
! 		s = binascii.a2b_base64(line)
! 		output.write(s)
  
  def encodestring(s):
! 	import StringIO
! 	f = StringIO.StringIO(s)
! 	g = StringIO.StringIO()
! 	encode(f, g)
! 	return g.getvalue()
  
  def decodestring(s):
! 	import StringIO
! 	f = StringIO.StringIO(s)
! 	g = StringIO.StringIO()
! 	decode(f, g)
! 	return g.getvalue()
  
- # Small test program
  def test():
! 	import sys, getopt
! 	try:
! 		opts, args = getopt.getopt(sys.argv[1:], 'deut')
! 	except getopt.error, msg:
! 		sys.stdout = sys.stderr
! 		print msg
! 		print """usage: basd64 [-d] [-e] [-u] [-t] [file|-]
! 		-d, -u: decode
! 		-e: encode (default)
! 		-t: decode string 'Aladdin:open sesame'"""
! 		sys.exit(2)
! 	func = encode
! 	for o, a in opts:
! 		if o == '-e': func = encode
! 		if o == '-d': func = decode
! 		if o == '-u': func = decode
! 		if o == '-t': test1(); return
! 	if args and args[0] != '-':
! 		func(open(args[0], 'rb'), sys.stdout)
! 	else:
! 		func(sys.stdin, sys.stdout)
  
  def test1():
! 	s0 = "Aladdin:open sesame"
! 	s1 = encodestring(s0)
! 	s2 = decodestring(s1)
! 	print s0, `s1`, s2
  
  if __name__ == '__main__':
! 	test()
--- 10,79 ----
  MAXBINSIZE = (MAXLINESIZE/4)*3
  
  def encode(input, output):
!     """Encode a file."""
!     while 1:
!         s = input.read(MAXBINSIZE)
!         if not s: break
!         while len(s) < MAXBINSIZE:
!             ns = input.read(MAXBINSIZE-len(s))
!             if not ns: break
!             s = s + ns
!         line = binascii.b2a_base64(s)
!         output.write(line)
  
  def decode(input, output):
!     """Decode a file."""
!     while 1:
!         line = input.readline()
!         if not line: break
!         s = binascii.a2b_base64(line)
!         output.write(s)
  
  def encodestring(s):
!     """Encode a string."""
!     import StringIO
!     f = StringIO.StringIO(s)
!     g = StringIO.StringIO()
!     encode(f, g)
!     return g.getvalue()
  
  def decodestring(s):
!     """Decode a string."""
!     import StringIO
!     f = StringIO.StringIO(s)
!     g = StringIO.StringIO()
!     decode(f, g)
!     return g.getvalue()
  
  def test():
!     """Small test program"""
!     import sys, getopt
!     try:
!         opts, args = getopt.getopt(sys.argv[1:], 'deut')
!     except getopt.error, msg:
!         sys.stdout = sys.stderr
!         print msg
!         print """usage: basd64 [-d] [-e] [-u] [-t] [file|-]
!         -d, -u: decode
!         -e: encode (default)
!         -t: decode string 'Aladdin:open sesame'"""
!         sys.exit(2)
!     func = encode
!     for o, a in opts:
!         if o == '-e': func = encode
!         if o == '-d': func = decode
!         if o == '-u': func = decode
!         if o == '-t': test1(); return
!     if args and args[0] != '-':
!         func(open(args[0], 'rb'), sys.stdout)
!     else:
!         func(sys.stdin, sys.stdout)
  
  def test1():
!     s0 = "Aladdin:open sesame"
!     s1 = encodestring(s0)
!     s2 = decodestring(s1)
!     print s0, `s1`, s2
  
  if __name__ == '__main__':
!     test()

Index: aifc.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/aifc.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** aifc.py	1999/08/26 15:50:43	1.34
--- aifc.py	2000/02/02 15:10:15	1.35
***************
*** 1,137 ****
! # Stuff to parse AIFF-C and AIFF files.
! #
! # Unless explicitly stated otherwise, the description below is true
! # both for AIFF-C files and AIFF files.
! #
! # An AIFF-C file has the following structure.
! #
! #	+-----------------+
! #	| FORM            |
! #	+-----------------+
[...1887 lines suppressed...]
!     print "Reading", fn
!     print "nchannels =", f.getnchannels()
!     print "nframes   =", f.getnframes()
!     print "sampwidth =", f.getsampwidth()
!     print "framerate =", f.getframerate()
!     print "comptype  =", f.getcomptype()
!     print "compname  =", f.getcompname()
!     if sys.argv[2:]:
!         gn = sys.argv[2]
!         print "Writing", gn
!         g = open(gn, 'w')
!         g.setparams(f.getparams())
!         while 1:
!             data = f.readframes(1024)
!             if not data:
!                 break
!             g.writeframes(data)
!         g.close()
!         f.close()
!         print "Done."



From fdrake@weyr.cnri.reston.va.us  Wed Feb  2 16:30:48 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 2 Feb 2000 11:30:48 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libmarshal.tex,1.16,1.16.4.1
Message-ID: <200002021630.LAA00871@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libmarshal.tex 
Log Message:

In the descriptions of dump() and load(), point out that the file has
to be opened in binary mode.


Index: libmarshal.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libmarshal.tex,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -C2 -r1.16 -r1.16.4.1
*** libmarshal.tex	1999/04/22 21:23:21	1.16
--- libmarshal.tex	2000/02/02 16:30:44	1.16.4.1
***************
*** 63,67 ****
    type.  The file must be an open file object such as
    \code{sys.stdout} or returned by \function{open()} or
!   \function{posix.popen()}.
  
    If the value has (or contains an object that has) an unsupported type,
--- 63,68 ----
    type.  The file must be an open file object such as
    \code{sys.stdout} or returned by \function{open()} or
!   \function{posix.popen()}.  It must be opened in binary mode
!   (\code{'wb'} or \code{'w+b'}).
  
    If the value has (or contains an object that has) an unsupported type,
***************
*** 74,78 ****
    Read one value from the open file and return it.  If no valid value
    is read, raise \exception{EOFError}, \exception{ValueError} or
!   \exception{TypeError}.  The file must be an open file object.
  
    \strong{Warning:} If an object containing an unsupported type was
--- 75,80 ----
    Read one value from the open file and return it.  If no valid value
    is read, raise \exception{EOFError}, \exception{ValueError} or
!   \exception{TypeError}.  The file must be an open file object opened
!   in binary mode (\code{'rb'} or \code{'r+b'}).
  
    \strong{Warning:} If an object containing an unsupported type was



From guido@cnri.reston.va.us  Wed Feb  2 16:51:09 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 2 Feb 2000 11:51:09 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib gzip.py,1.14,1.15
Message-ID: <200002021651.LAA22922@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	gzip.py 
Log Message:
Make read() and readlines() conform more to the file object interface:
the default arg for read() is -1, not None, and readlines() has an
optional argument (which for now is ignored).


Index: gzip.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/gzip.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** gzip.py	1999/09/06 16:34:51	1.14
--- gzip.py	2000/02/02 16:51:06	1.15
***************
*** 140,149 ****
          self.write(string.join(lines))
  
!     def read(self, size=None):
          if self.extrasize <= 0 and self.fileobj is None:
              return ''
  
          readsize = 1024
!         if not size:        # get the whole thing
              try:
                  while 1:
--- 140,149 ----
          self.write(string.join(lines))
  
!     def read(self, size=-1):
          if self.extrasize <= 0 and self.fileobj is None:
              return ''
  
          readsize = 1024
!         if size < 0:        # get the whole thing
              try:
                  while 1:
***************
*** 282,286 ****
              readsize = readsize * 2
  
!     def readlines(self):
          buf = self.read()
          lines = string.split(buf, '\n')
--- 282,286 ----
              readsize = readsize * 2
  
!     def readlines(self, ignored=None):
          buf = self.read()
          lines = string.split(buf, '\n')



From guido@cnri.reston.va.us  Wed Feb  2 16:54:42 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 2 Feb 2000 11:54:42 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib ntpath.py,1.21,1.22
Message-ID: <200002021654.LAA22950@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	ntpath.py 
Log Message:
Optimize abspath() slightly for the case that win32api can't be
imported; in that case, abspath is replaced by a fallback version.


Index: ntpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ntpath.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** ntpath.py	1999/11/30 15:00:00	1.21
--- ntpath.py	2000/02/02 16:54:39	1.22
***************
*** 404,413 ****
      try:
          import win32api
-         try:
-             path = win32api.GetFullPathName(path)
-         except win32api.error:
-             pass # Bad path - return unchanged.
      except ImportError:
!         if not isabs(path):
!             path = join(os.getcwd(), path)
      return normpath(path)
--- 404,418 ----
      try:
          import win32api
      except ImportError:
!         global abspath
!         def _abspath(path):
!             if not isabs(path):
!                 path = join(os.getcwd(), path)
!             return normpath(path)
!         abspath = _abspath
!         return _abspath(path)
!     try:
!         path = win32api.GetFullPathName(path)
!     except win32api.error:
!         pass # Bad path - return unchanged.
      return normpath(path)



From guido@cnri.reston.va.us  Wed Feb  2 16:57:34 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 2 Feb 2000 11:57:34 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/plat-win socket.py,1.6,1.7
Message-ID: <200002021657.LAA22978@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/plat-win
In directory eric:/projects/python/develop/guido/src/Lib/plat-win

Modified Files:
	socket.py 
Log Message:
In _fileobject, optimize read() a bit (it could be really slow), and
remove "import string" -- use string methods instead!


Index: socket.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/plat-win/socket.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** socket.py	1998/05/06 13:48:04	1.6
--- socket.py	2000/02/02 16:57:32	1.7
***************
*** 97,125 ****
  	def read(self, n=-1):
  		if n >= 0:
! 			while len(self._rbuf) < n:
! 				new = self._sock.recv(self._rbufsize)
  				if not new: break
! 				self._rbuf = self._rbuf + new
! 			data, self._rbuf = self._rbuf[:n], self._rbuf[n:]
! 			return data
  		while 1:
! 			new = self._sock.recv(self._rbufsize)
  			if not new: break
! 			self._rbuf = self._rbuf + new
! 		data, self._rbuf = self._rbuf, ""
! 		return data
  
! 	def readline(self):
! 		import string
  		data = ""
! 		i = string.find(self._rbuf, '\n')
! 		while i < 0:
  			new = self._sock.recv(self._rbufsize)
  			if not new: break
! 			i = string.find(new, '\n')
  			if i >= 0: i = i + len(self._rbuf)
  			self._rbuf = self._rbuf + new
  		if i < 0: i = len(self._rbuf)
  		else: i = i+1
  		data, self._rbuf = self._rbuf[:i], self._rbuf[i:]
  		return data
--- 97,141 ----
  	def read(self, n=-1):
  		if n >= 0:
! 			k = len(self._rbuf)
! 			if n <= k:
! 				data = self._rbuf[:n]
! 				self._rbuf = self._rbuf[n:]
! 				return data
! 			n = n - k
! 			l = [self._rbuf]
! 			self._rbuf = ""
! 			while n > 0:
! 				new = self._sock.recv(max(n, self._rbufsize))
  				if not new: break
! 				k = len(new)
! 				if k > n:
! 					l.append(new[:n])
! 					self._rbuf = new[n:]
! 					break
! 				l.append(new)
! 				n = n - k
! 			return "".join(l)
! 		k = max(512, self._rbufsize)
! 		l = [self._rbuf]
! 		self._rbuf = ""
  		while 1:
! 			new = self._sock.recv(k)
  			if not new: break
! 			l.append(new)
! 			k = min(k*2, 1024**2)
! 		return "".join(l)
  
! 	def readline(self, limit=-1):
  		data = ""
! 		i = self._rbuf.find('\n')
! 		while i < 0 and not (0 < limit <= len(self._rbuf)):
  			new = self._sock.recv(self._rbufsize)
  			if not new: break
! 			i = new.find('\n')
  			if i >= 0: i = i + len(self._rbuf)
  			self._rbuf = self._rbuf + new
  		if i < 0: i = len(self._rbuf)
  		else: i = i+1
+ 		if 0 <= limit < len(self._rbuf): i = limit
  		data, self._rbuf = self._rbuf[:i], self._rbuf[i:]
  		return data



From guido@cnri.reston.va.us  Thu Feb  3 00:41:24 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 2 Feb 2000 19:41:24 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib filecmp.py,1.1,1.2
Message-ID: <200002030041.TAA25281@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	filecmp.py 
Log Message:
# module filecmp
# combo of old cmp, cmpcache and dircmp with redundancies removed
#
# bugs fixed:
#   dircmp.dircmp was not ignoring IGNORES
#   old stuff could falsely report files as "identical" when contents actually differed
#
# enhancements:
#   dircmp has a more straightforward interface
#cmp enhanced by Moshe Zadca
#dircmp enhanced byGordon McMillan

[some layout changes by GvR]


Index: filecmp.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/filecmp.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** filecmp.py	1999/10/26 14:02:01	1.1
--- filecmp.py	2000/02/03 00:41:22	1.2
***************
*** 1,57 ****
! """Compare files."""
  
! import os, stat, statcache
  
  _cache = {}
  BUFSIZE=8*1024
  
! def cmp(f1, f2, shallow=1,use_statcache=0): 
! 	"""Compare two files.
  
! 	Arguments:
  
! 	f1 -- First file name
  
! 	f2 -- Second file name
  
! 	shallow -- Just check stat signature (do not read the files).
! 	           defaults to 1.
  
! 	use_statcache -- Do not stat() each file directly: go through
! 	                 the statcache module for more efficiency.
  
! 	Return value:
  
! 	integer -- 1 if the files are the same, 0 otherwise.
  
! 	This function uses a cache for past comparisons and the results,
! 	with a cache invalidation mechanism relying on stale signatures.
! 	Of course, if 'use_statcache' is true, this mechanism is defeated,
! 	and the cache will never grow stale.
  
! 	"""
! 	stat_function = (os.stat, statcache.stat)[use_statcache]
! 	s1, s2 = _sig(stat_function(f1)), _sig(stat_function(f2))
! 	if s1[0]!=stat.S_IFREG or s2[0]!=stat.S_IFREG: return 0
! 	if shallow and s1 == s2: return 1
! 	if s1[1]!=s2[1]:         return 0
  
! 	result = _cache.get((f1, f2))
! 	if result and (s1, s2)==result[:2]:
! 		return result[2]
! 	outcome = _do_cmp(f1, f2)
! 	_cache[f1, f2] = s1, s2, outcome
! 	return outcome
  
  def _sig(st):
! 	return (stat.S_IFMT(st[stat.ST_MODE]), 
! 	        st[stat.ST_SIZE], 
! 	        st[stat.ST_MTIME])
  
  def _do_cmp(f1, f2):
! 	bufsize = BUFSIZE
! 	fp1 , fp2 = open(f1, 'rb'), open(f2, 'rb')
! 	while 1:
! 		b1, b2 = fp1.read(bufsize), fp2.read(bufsize)
! 		if b1!=b2: return 0
! 		if not b1: return 1
--- 1,318 ----
! """Utilities for comparing files and directories.
  
! Classes:
!     dircmp
  
+ Functions:
+     cmp(f1, f2, shallow=1, use_statcache=0) -> int
+     cmpfiles(a, b, common) -> ([], [], [])
+ 
+ """
+ 
+ import os
+ import stat
+ import statcache
+ 
  _cache = {}
  BUFSIZE=8*1024
  
! def cmp(f1, f2, shallow=1,use_statcache=0):
!     """Compare two files.
  
!     Arguments:
  
!     f1 -- First file name
  
!     f2 -- Second file name
  
!     shallow -- Just check stat signature (do not read the files).
!                defaults to 1.
  
!     use_statcache -- Do not stat() each file directly: go through
!                      the statcache module for more efficiency.
  
!     Return value:
  
!     integer -- 1 if the files are the same, 0 otherwise.
  
!     This function uses a cache for past comparisons and the results,
!     with a cache invalidation mechanism relying on stale signatures.
!     Of course, if 'use_statcache' is true, this mechanism is defeated,
!     and the cache will never grow stale.
  
!     """
!     stat_function = (os.stat, statcache.stat)[use_statcache]
!     s1, s2 = _sig(stat_function(f1)), _sig(stat_function(f2))
!     if s1[0]!=stat.S_IFREG or s2[0]!=stat.S_IFREG: return 0
!     if shallow and s1 == s2: return 1
!     if s1[1]!=s2[1]:         return 0
  
!     result = _cache.get((f1, f2))
!     if result and (s1, s2)==result[:2]:
!         return result[2]
!     outcome = _do_cmp(f1, f2)
!     _cache[f1, f2] = s1, s2, outcome
!     return outcome
  
  def _sig(st):
!     return (stat.S_IFMT(st[stat.ST_MODE]),
!             st[stat.ST_SIZE],
!             st[stat.ST_MTIME])
  
  def _do_cmp(f1, f2):
!     bufsize = BUFSIZE
!     fp1 , fp2 = open(f1, 'rb'), open(f2, 'rb')
!     while 1:
!         b1, b2 = fp1.read(bufsize), fp2.read(bufsize)
!         if b1!=b2: return 0
!         if not b1: return 1
! 
! # Directory comparison class.
! #
! class dircmp:
!     """A class that manages the comparison of 2 directories.
! 
!     dircmp(a,b,ignore=None,hide=None)
!       A and B are directories.
!       IGNORE is a list of names to ignore,
!         defaults to ['RCS', 'CVS', 'tags'].
!       HIDE is a list of names to hide,
!         defaults to [os.curdir, os.pardir].
! 
!     High level usage:
!       x = dircmp(dir1, dir2)
!       x.report() -> prints a report on the differences between dir1 and dir2
!        or
!       x.report_partial_closure() -> prints report on differences between dir1
!             and dir2, and reports on common immediate subdirectories.
!       x.report_full_closure() -> like report_partial_closure,
!             but fully recursive.
! 
!     Attributes:
!      left_list, right_list: The files in dir1 and dir2,
!         filtered by hide and ignore.
!      common: a list of names in both dir1 and dir2.
!      left_only, right_only: names only in dir1, dir2.
!      common_dirs: subdirectories in both dir1 and dir2.
!      common_files: files in both dir1 and dir2.
!      common_funny: names in both dir1 and dir2 where the type differs between
!         dir1 and dir2, or the name is not stat-able.
!      same_files: list of identical files.
!      diff_files: list of filenames which differ.
!      funny_files: list of files which could not be compared.
!      subdirs: a dictionary of dircmp objects, keyed by names in common_dirs.
!      """
! 
!     def __init__(self, a, b, ignore=None, hide=None): # Initialize
!         self.left = a
!         self.right = b
!         if hide is None:
!             self.hide = [os.curdir, os.pardir] # Names never to be shown
!         else:
!             self.hide = hide
!         if ignore is None:
!             self.ignore = ['RCS', 'CVS', 'tags'] # Names ignored in comparison
!         else:
!             self.ignore = ignore
! 
!     def phase0(self): # Compare everything except common subdirectories
!         self.left_list = _filter(os.listdir(self.left),
!                                  self.hide+self.ignore)
!         self.right_list = _filter(os.listdir(self.right),
!                                   self.hide+self.ignore)
!         self.left_list.sort()
!         self.right_list.sort()
! 
!     __p4_attrs = ('subdirs',)
!     __p3_attrs = ('same_files', 'diff_files', 'funny_files')
!     __p2_attrs = ('common_dirs', 'common_files', 'common_funny')
!     __p1_attrs = ('common', 'left_only', 'right_only')
!     __p0_attrs = ('left_list', 'right_list')
! 
!     def __getattr__(self, attr):
!         if attr in self.__p4_attrs:
!             self.phase4()
!         elif attr in self.__p3_attrs:
!             self.phase3()
!         elif attr in self.__p2_attrs:
!             self.phase2()
!         elif attr in self.__p1_attrs:
!             self.phase1()
!         elif attr in self.__p0_attrs:
!             self.phase0()
!         else:
!             raise AttributeError, attr
!         return getattr(self, attr)
! 
!     def phase1(self): # Compute common names
!         a_only, b_only = [], []
!         common = {}
!         b = {}
!         for fnm in self.right_list:
!             b[fnm] = 1
!         for x in self.left_list:
!             if b.get(x, 0):
!                 common[x] = 1
!             else:
!                 a_only.append(x)
!         for x in self.right_list:
!             if common.get(x, 0):
!                 pass
!             else:
!                 b_only.append(x)
!         self.common = common.keys()
!         self.left_only = a_only
!         self.right_only = b_only
! 
!     def phase2(self): # Distinguish files, directories, funnies
!         self.common_dirs = []
!         self.common_files = []
!         self.common_funny = []
! 
!         for x in self.common:
!             a_path = os.path.join(self.left, x)
!             b_path = os.path.join(self.right, x)
! 
!             ok = 1
!             try:
!                 a_stat = statcache.stat(a_path)
!             except os.error, why:
!                 # print 'Can\'t stat', a_path, ':', why[1]
!                 ok = 0
!             try:
!                 b_stat = statcache.stat(b_path)
!             except os.error, why:
!                 # print 'Can\'t stat', b_path, ':', why[1]
!                 ok = 0
! 
!             if ok:
!                 a_type = stat.S_IFMT(a_stat[stat.ST_MODE])
!                 b_type = stat.S_IFMT(b_stat[stat.ST_MODE])
!                 if a_type <> b_type:
!                     self.common_funny.append(x)
!                 elif stat.S_ISDIR(a_type):
!                     self.common_dirs.append(x)
!                 elif stat.S_ISREG(a_type):
!                     self.common_files.append(x)
!                 else:
!                     self.common_funny.append(x)
!             else:
!                 self.common_funny.append(x)
! 
!     def phase3(self): # Find out differences between common files
!         xx = cmpfiles(self.left, self.right, self.common_files)
!         self.same_files, self.diff_files, self.funny_files = xx
! 
!     def phase4(self): # Find out differences between common subdirectories
!         # A new dircmp object is created for each common subdirectory,
!         # these are stored in a dictionary indexed by filename.
!         # The hide and ignore properties are inherited from the parent
!         self.subdirs = {}
!         for x in self.common_dirs:
!             a_x = os.path.join(self.left, x)
!             b_x = os.path.join(self.right, x)
!             self.subdirs[x]  = dircmp(a_x, b_x, self.ignore, self.hide)
! 
!     def phase4_closure(self): # Recursively call phase4() on subdirectories
!         self.phase4()
!         for x in self.subdirs.keys():
!             self.subdirs[x].phase4_closure()
! 
!     def report(self): # Print a report on the differences between a and b
!         # Output format is purposely lousy
!         print 'diff', self.left, self.right
!         if self.left_only:
!             self.left_only.sort()
!             print 'Only in', self.left, ':', self.left_only
!         if self.right_only:
!             self.right_only.sort()
!             print 'Only in', self.right, ':', self.right_only
!         if self.same_files:
!             self.same_files.sort()
!             print 'Identical files :', self.same_files
!         if self.diff_files:
!             self.diff_files.sort()
!             print 'Differing files :', self.diff_files
!         if self.funny_files:
!             self.funny_files.sort()
!             print 'Trouble with common files :', self.funny_files
!         if self.common_dirs:
!             self.common_dirs.sort()
!             print 'Common subdirectories :', self.common_dirs
!         if self.common_funny:
!             self.common_funny.sort()
!             print 'Common funny cases :', self.common_funny
! 
!     def report_partial_closure(self): # Print reports on self and on subdirs
!         self.report()
!         for x in self.subdirs.keys():
!             print
!             self.subdirs[x].report()
! 
!     def report_full_closure(self): # Report on self and subdirs recursively
!         self.report()
!         for x in self.subdirs.keys():
!             print
!             self.subdirs[x].report_full_closure()
! 
! 
! # Compare common files in two directories.
! # Return:
! #	- files that compare equal
! #	- files that compare different
! #	- funny cases (can't stat etc.)
! #
! def cmpfiles(a, b, common):
!     """Compare common files in two directories.
! 
!     cmpfiles(a,b,common)
!       A and B are directory names
!       COMMON is a list of file names
!     returns a tuple of three lists:
!       files that compare equal
!       files that are different
!       filenames that aren't regular files."""
! 
!     res = ([], [], [])
!     for x in common:
!         res[_cmp(os.path.join(a, x), os.path.join(b, x))].append(x)
!     return res
! 
! 
! # Compare two files.
! # Return:
! #	0 for equal
! #	1 for different
! #	2 for funny cases (can't stat, etc.)
! #
! def _cmp(a, b):
!     try:
!         return not abs(cmp(a, b))
!     except os.error:
!         return 2
! 
! 
! # Return a copy with items that occur in skip removed.
! #
! def _filter(list, skip):
!     result = []
!     for item in list:
!         if item not in skip: result.append(item)
!     return result
! 
! 
! # Demonstration and testing.
! #
! def demo():
!     import sys
!     import getopt
!     options, args = getopt.getopt(sys.argv[1:], 'r')
!     if len(args) <> 2: raise getopt.error, 'need exactly two args'
!     dd = dircmp(args[0], args[1])
!     if ('-r', '') in options:
!         dd.report_full_closure()
!     else:
!         dd.report()
! 
! if __name__ == '__main__':
!     demo()



From guido@cnri.reston.va.us  Thu Feb  3 13:42:53 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 3 Feb 2000 08:42:53 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src configure.in,1.114,1.115
Message-ID: <200002031342.IAA26792@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src
In directory eric:/projects/python/develop/guido/src

Modified Files:
	configure.in 
Log Message:
According to Harri Pasanen, the Solaris+gcc test for LINKFORSHARED
needed an adaptation for the latest gcc -- we need to grep stderr as
well as stdout for the magic string BFD.  (Does anybody know what BFD
means?)


Index: configure.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** configure.in	1999/12/20 21:27:22	1.114
--- configure.in	2000/02/03 13:42:50	1.115
***************
*** 1,4 ****
  dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.114 $)
  AC_PREREQ(2.0)
  AC_INIT(Include/object.h)
--- 1,4 ----
  dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.115 $)
  AC_PREREQ(2.0)
  AC_INIT(Include/object.h)
***************
*** 566,570 ****
  	SunOS/5*) case $CC in
  		  *gcc*)
! 		    if $CC -Xlinker -V 2>/dev/null | grep BFD >/dev/null
  		    then
  			LINKFORSHARED="-Xlinker --export-dynamic"
--- 566,570 ----
  	SunOS/5*) case $CC in
  		  *gcc*)
! 		    if $CC -Xlinker -V 2>&1 | grep BFD >/dev/null
  		    then
  			LINKFORSHARED="-Xlinker --export-dynamic"



From guido@cnri.reston.va.us  Thu Feb  3 13:50:27 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 3 Feb 2000 08:50:27 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src configure,1.106,1.107
Message-ID: <200002031350.IAA27300@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src
In directory eric:/projects/python/develop/guido/src

Modified Files:
	configure 
Log Message:
According to Harri Pasanen, the Solaris+gcc test for LINKFORSHARED
needed an adaptation for the latest gcc -- we need to grep stderr as
well as stdout for the magic string BFD.  (Does anybody know what BFD
means?)


Index: configure
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -r1.106 -r1.107
*** configure	1999/12/20 21:27:22	1.106
--- configure	2000/02/03 13:50:24	1.107
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.114 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.115 
  
  # Guess values for system-dependent variables and create Makefiles.
***************
*** 2356,2360 ****
  	SunOS/5*) case $CC in
  		  *gcc*)
! 		    if $CC -Xlinker -V 2>/dev/null | grep BFD >/dev/null
  		    then
  			LINKFORSHARED="-Xlinker --export-dynamic"
--- 2356,2360 ----
  	SunOS/5*) case $CC in
  		  *gcc*)
! 		    if $CC -Xlinker -V 2>&1 | grep BFD >/dev/null
  		    then
  			LINKFORSHARED="-Xlinker --export-dynamic"



From gstein@lyra.org  Thu Feb  3 13:56:11 2000
From: gstein@lyra.org (Greg Stein)
Date: Thu, 3 Feb 2000 05:56:11 -0800 (PST)
Subject: [Python-checkins] CVS: python/dist/src configure,1.106,1.107
In-Reply-To: <200002031350.IAA27300@eric.cnri.reston.va.us>
Message-ID: <Pine.LNX.4.10.10002030555210.28358-100000@nebula.lyra.org>

In some contexts, it means "Big Fucking Deal". I doubt that is the meaning
in this situation, though.

:-)


On Thu, 3 Feb 2000, Guido van Rossum wrote:

> Update of /projects/cvsroot/python/dist/src
> In directory eric:/projects/python/develop/guido/src
> 
> Modified Files:
> 	configure 
> Log Message:
> According to Harri Pasanen, the Solaris+gcc test for LINKFORSHARED
> needed an adaptation for the latest gcc -- we need to grep stderr as
> well as stdout for the magic string BFD.  (Does anybody know what BFD
> means?)
> 
> 
> Index: configure
> ===================================================================
> RCS file: /projects/cvsroot/python/dist/src/configure,v
> retrieving revision 1.106
> retrieving revision 1.107
> diff -C2 -r1.106 -r1.107
> *** configure	1999/12/20 21:27:22	1.106
> --- configure	2000/02/03 13:50:24	1.107
> ***************
> *** 1,5 ****
>   #! /bin/sh
>   
> ! # From configure.in Revision: 1.114 
>   
>   # Guess values for system-dependent variables and create Makefiles.
> --- 1,5 ----
>   #! /bin/sh
>   
> ! # From configure.in Revision: 1.115 
>   
>   # Guess values for system-dependent variables and create Makefiles.
> ***************
> *** 2356,2360 ****
>   	SunOS/5*) case $CC in
>   		  *gcc*)
> ! 		    if $CC -Xlinker -V 2>/dev/null | grep BFD >/dev/null
>   		    then
>   			LINKFORSHARED="-Xlinker --export-dynamic"
> --- 2356,2360 ----
>   	SunOS/5*) case $CC in
>   		  *gcc*)
> ! 		    if $CC -Xlinker -V 2>&1 | grep BFD >/dev/null
>   		    then
>   			LINKFORSHARED="-Xlinker --export-dynamic"
> 
> 
> _______________________________________________
> Python-checkins mailing list
> Python-checkins@python.org
> http://www.python.org/mailman/listinfo/python-checkins
> 

-- 
Greg Stein, http://www.lyra.org/



From Vladimir.Marangozov@inrialpes.fr  Thu Feb  3 14:15:56 2000
From: Vladimir.Marangozov@inrialpes.fr (Vladimir Marangozov)
Date: Thu, 3 Feb 2000 15:15:56 +0100 (CET)
Subject: [Python-checkins] BFD
Message-ID: <200002031415.PAA09557@python.inrialpes.fr>

Oops, my "pycvs" alias wasn't set and the Cc: failed.

Forwarded message:
> From marangoz Thu Feb  3 15:11:02 2000
> Subject: Re: [Python-checkins] CVS: python/dist/src configure,1.106,1.107
> To: guido@cnri.reston.va.us (Guido van Rossum)
> Date: Thu, 3 Feb 2000 15:11:02 +0100 (CET)
> Cc: pycvs
> In-Reply-To: <200002031350.IAA27300@eric.cnri.reston.va.us> from "Guido van Rossum" at Feb 03, 2000 08:50:27 AM
> Reply-To: Vladimir.Marangozov@inrialpes.fr
> X-Mailer: ELM [version 2.5 PL1]
> Content-Length: 898       
> 
> Guido van Rossum wrote:
> > 
> > Update of /projects/cvsroot/python/dist/src
> > In directory eric:/projects/python/develop/guido/src
> > 
> > Modified Files:
> > 	configure 
> > Log Message:
> > According to Harri Pasanen, the Solaris+gcc test for LINKFORSHARED
> > needed an adaptation for the latest gcc -- we need to grep stderr as
> > well as stdout for the magic string BFD.  (Does anybody know what BFD
> > means?)
> 
> BFD stands for Binary File Descriptor. It's 1) a library used by most GNU
> tools, especially in GNU binutils, and more precisely 2) an internal format/
> structure + an interface allowing different tools to manipulate object files
> in a uniform way.
> 
> I don't know how this relates to the build on Solaris + GCC, so I'm
> trusting Harri and you for that...
> 
> -- 
>        Vladimir MARANGOZOV          | Vladimir.Marangozov@inrialpes.fr
> http://sirac.inrialpes.fr/~marangoz | tel:(+33-4)76615277 fax:76615252
> 


-- 
       Vladimir MARANGOZOV          | Vladimir.Marangozov@inrialpes.fr
http://sirac.inrialpes.fr/~marangoz | tel:(+33-4)76615277 fax:76615252


From fdrake@weyr.cnri.reston.va.us  Thu Feb  3 15:25:35 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 3 Feb 2000 10:25:35 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/lib-old cmp.py,NONE,1.1 cmpcache.py,NONE,1.1 dircmp.py,NONE,1.1
Message-ID: <200002031525.KAA02769@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/lib-old
In directory weyr:/home/fdrake/projects/python/Lib/lib-old

Added Files:
	cmp.py cmpcache.py dircmp.py 
Log Message:
These modules are now declared obsolete.






From fdrake@weyr.cnri.reston.va.us  Thu Feb  3 15:26:19 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 3 Feb 2000 10:26:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib cmp.py,1.8,NONE cmpcache.py,1.8,NONE dircmp.py,1.8,NONE
Message-ID: <200002031526.KAA02800@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Removed Files:
	cmp.py cmpcache.py dircmp.py 
Log Message:
These modules are now declared obsolete.






From fdrake@weyr.cnri.reston.va.us  Thu Feb  3 15:27:29 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 3 Feb 2000 10:27:29 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libundoc.tex,1.71,1.72
Message-ID: <200002031527.KAA02833@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc/lib

Modified Files:
	libundoc.tex 
Log Message:

The dircmp module is now obsolete.


Index: libundoc.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libundoc.tex,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -r1.71 -r1.72
*** libundoc.tex	1999/12/01 18:44:09	1.71
--- libundoc.tex	2000/02/03 15:27:26	1.72
***************
*** 36,42 ****
  
  \begin{description}
- \item[\module{dircmp}]
- --- class to build directory diff tools on (may become a demo or tool)
- 
  \item[\module{bdb}]
  --- A generic Python debugger base class (used by pdb)
--- 36,39 ----
***************
*** 109,112 ****
--- 106,112 ----
  \member{co.co_name}, \member{func.func_name},
  \member{co.co_firstlineno}).
+ 
+ \item[\module{dircmp}]
+ --- class to build directory diff tools on (may become a demo or tool)
  
  \item[\module{dump}]



From guido@cnri.reston.va.us  Thu Feb  3 17:19:38 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 3 Feb 2000 12:19:38 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/PCbuild _tkinter.dsp,1.9,1.10 parser.dsp,1.5,1.6 python.dsp,1.7,1.8 python15.dsp,1.10,1.11 pythonw.dsp,1.6,1.7 zlib.dsp,1.7,1.8
Message-ID: <200002031719.MAA29329@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/PCbuild
In directory eric:/projects/python/develop/guido/src/PCbuild

Modified Files:
	_tkinter.dsp parser.dsp python.dsp python15.dsp pythonw.dsp 
	zlib.dsp 
Log Message:
Mark Hammond renames the x86 projects back to what they were named
before the patch by Trent Mick.  Since he now also works for
ActiveState, I suppose he overrides Trent. :-)


Index: _tkinter.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/_tkinter.dsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** _tkinter.dsp	2000/01/21 00:03:42	1.9
--- _tkinter.dsp	2000/02/03 17:19:35	1.10
***************
*** 21,26 ****
  !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
--- 21,26 ----
  !MESSAGE "_tkinter - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "_tkinter - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "_tkinter - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
***************
*** 30,34 ****
  # PROP Scc_LocalPath "..\..\.."
  
! !IF  "$(CFG)" == "_tkinter - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath "..\..\.."
  
! !IF  "$(CFG)" == "_tkinter - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 61,65 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 61,65 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 160,165 ****
  # Begin Target
  
! # Name "_tkinter - Win32 x86 Release"
! # Name "_tkinter - Win32 x86 Debug"
  # Name "_tkinter - Win32 Alpha Debug"
  # Name "_tkinter - Win32 Alpha Release"
--- 160,165 ----
  # Begin Target
  
! # Name "_tkinter - Win32 Release"
! # Name "_tkinter - Win32 Debug"
  # Name "_tkinter - Win32 Alpha Debug"
  # Name "_tkinter - Win32 Alpha Release"
***************
*** 168,174 ****
  SOURCE=..\Modules\_tkinter.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
--- 168,174 ----
  SOURCE=..\Modules\_tkinter.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
***************
*** 183,189 ****
  SOURCE=..\Modules\tkappinit.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"
--- 183,189 ----
  SOURCE=..\Modules\tkappinit.c
  
! !IF  "$(CFG)" == "_tkinter - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "_tkinter - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "_tkinter - Win32 Alpha Debug"

Index: parser.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/parser.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** parser.dsp	2000/01/20 21:31:41	1.5
--- parser.dsp	2000/02/03 17:19:35	1.6
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "parser - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "parser - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "parser - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "parser - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "parser - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "parser - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "parser - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "parser - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
***************
*** 30,34 ****
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "parser - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "parser - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 61,65 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "parser - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 61,65 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "parser - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 160,165 ****
  # Begin Target
  
! # Name "parser - Win32 x86 Release"
! # Name "parser - Win32 x86 Debug"
  # Name "parser - Win32 Alpha Debug"
  # Name "parser - Win32 Alpha Release"
--- 160,165 ----
  # Begin Target
  
! # Name "parser - Win32 Release"
! # Name "parser - Win32 Debug"
  # Name "parser - Win32 Alpha Debug"
  # Name "parser - Win32 Alpha Release"
***************
*** 168,174 ****
  SOURCE=..\Modules\parsermodule.c
  
! !IF  "$(CFG)" == "parser - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "parser - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "parser - Win32 Alpha Debug"
--- 168,174 ----
  SOURCE=..\Modules\parsermodule.c
  
! !IF  "$(CFG)" == "parser - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "parser - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "parser - Win32 Alpha Debug"

Index: python.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/python.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** python.dsp	2000/01/20 21:31:41	1.7
--- python.dsp	2000/02/03 17:19:35	1.8
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "python - Win32 x86 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "python - Win32 x86 Debug" (based on "Win32 (x86) Console Application")
  !MESSAGE "python - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
  !MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "python - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "python - Win32 Debug" (based on "Win32 (x86) Console Application")
  !MESSAGE "python - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
  !MESSAGE "python - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")
***************
*** 30,34 ****
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "python - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "python - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 56,60 ****
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release"
  
! !ELSEIF  "$(CFG)" == "python - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 56,60 ----
  # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release"
  
! !ELSEIF  "$(CFG)" == "python - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 140,145 ****
  # Begin Target
  
! # Name "python - Win32 x86 Release"
! # Name "python - Win32 x86 Debug"
  # Name "python - Win32 Alpha Debug"
  # Name "python - Win32 Alpha Release"
--- 140,145 ----
  # Begin Target
  
! # Name "python - Win32 Release"
! # Name "python - Win32 Debug"
  # Name "python - Win32 Alpha Debug"
  # Name "python - Win32 Alpha Release"
***************
*** 152,158 ****
  SOURCE=..\Modules\python.c
  
! !IF  "$(CFG)" == "python - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "python - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"
--- 152,158 ----
  SOURCE=..\Modules\python.c
  
! !IF  "$(CFG)" == "python - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "python - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"

Index: python15.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/python15.dsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** python15.dsp	2000/01/20 21:31:41	1.10
--- python15.dsp	2000/02/03 17:19:35	1.11
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "python15 - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "python15 - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "python15 - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "python15 - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "python15 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
[...1694 lines suppressed...]
! !ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
***************
*** 1637,1643 ****
  SOURCE=..\Modules\yuvconvert.c
  
! !IF  "$(CFG)" == "python15 - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "python15 - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"
--- 1637,1643 ----
  SOURCE=..\Modules\yuvconvert.c
  
! !IF  "$(CFG)" == "python15 - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "python15 - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "python15 - Win32 Alpha Debug"

Index: pythonw.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/pythonw.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pythonw.dsp	2000/01/20 21:31:41	1.6
--- pythonw.dsp	2000/02/03 17:19:35	1.7
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "pythonw - Win32 x86 Release" (based on "Win32 (x86) Application")
! !MESSAGE "pythonw - Win32 x86 Debug" (based on "Win32 (x86) Application")
  !MESSAGE "pythonw - Win32 Alpha Debug" (based on "Win32 (ALPHA) Application")
  !MESSAGE "pythonw - Win32 Alpha Release" (based on "Win32 (ALPHA) Application")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "pythonw - Win32 Release" (based on "Win32 (x86) Application")
! !MESSAGE "pythonw - Win32 Debug" (based on "Win32 (x86) Application")
  !MESSAGE "pythonw - Win32 Alpha Debug" (based on "Win32 (ALPHA) Application")
  !MESSAGE "pythonw - Win32 Alpha Release" (based on "Win32 (ALPHA) Application")
***************
*** 30,34 ****
  # PROP Scc_LocalPath "..\pc"
  
! !IF  "$(CFG)" == "pythonw - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath "..\pc"
  
! !IF  "$(CFG)" == "pythonw - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 60,64 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "pythonw - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 60,64 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "pythonw - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 158,163 ****
  # Begin Target
  
! # Name "pythonw - Win32 x86 Release"
! # Name "pythonw - Win32 x86 Debug"
  # Name "pythonw - Win32 Alpha Debug"
  # Name "pythonw - Win32 Alpha Release"
--- 158,163 ----
  # Begin Target
  
! # Name "pythonw - Win32 Release"
! # Name "pythonw - Win32 Debug"
  # Name "pythonw - Win32 Alpha Debug"
  # Name "pythonw - Win32 Alpha Release"
***************
*** 170,176 ****
  SOURCE=..\PC\WinMain.c
  
! !IF  "$(CFG)" == "pythonw - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "pythonw - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "pythonw - Win32 Alpha Debug"
--- 170,176 ----
  SOURCE=..\PC\WinMain.c
  
! !IF  "$(CFG)" == "pythonw - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "pythonw - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "pythonw - Win32 Alpha Debug"

Index: zlib.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/zlib.dsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** zlib.dsp	2000/01/20 21:31:41	1.7
--- zlib.dsp	2000/02/03 17:19:35	1.8
***************
*** 5,9 ****
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
! CFG=zlib - Win32 x86 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
--- 5,9 ----
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
! CFG=zlib - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
***************
*** 14,23 ****
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
! !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 x86 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "zlib - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "zlib - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
--- 14,23 ----
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
! !MESSAGE NMAKE /f "zlib.mak" CFG="zlib - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "zlib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "zlib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
***************
*** 30,34 ****
  RSC=rc.exe
  
! !IF  "$(CFG)" == "zlib - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  RSC=rc.exe
  
! !IF  "$(CFG)" == "zlib - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 58,62 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "zlib - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 58,62 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "zlib - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 90,95 ****
  # Begin Target
  
! # Name "zlib - Win32 x86 Release"
! # Name "zlib - Win32 x86 Debug"
  # Begin Source File
  
--- 90,95 ----
  # Begin Target
  
! # Name "zlib - Win32 Release"
! # Name "zlib - Win32 Debug"
  # Begin Source File
  



From fdrake@weyr.cnri.reston.va.us  Thu Feb  3 18:23:38 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 3 Feb 2000 13:23:38 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.7,1.56.2.8
Message-ID: <200002031823.NAA03107@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p1/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

PySequence_In() is replaced by PySequence_Contains().


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.7
retrieving revision 1.56.2.8
diff -C2 -r1.56.2.7 -r1.56.2.8
*** api.tex	2000/01/17 14:30:04	1.56.2.7
--- api.tex	2000/02/03 18:23:34	1.56.2.8
***************
*** 1552,1556 ****
  \end{cfuncdesc}
  
! \begin{cfuncdesc}{int}{PySequence_In}{PyObject *o, PyObject *value}
  Determine if \var{o} contains \var{value}.  If an item in \var{o} is
  equal to \var{value}, return \code{1}, otherwise return \code{0}.  On
--- 1552,1556 ----
  \end{cfuncdesc}
  
! \begin{cfuncdesc}{int}{PySequence_Contains}{PyObject *o, PyObject *value}
  Determine if \var{o} contains \var{value}.  If an item in \var{o} is
  equal to \var{value}, return \code{1}, otherwise return \code{0}.  On



From guido@cnri.reston.va.us  Fri Feb  4 15:10:40 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 4 Feb 2000 10:10:40 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib dospath.py,1.10,1.11 filecmp.py,1.2,1.3 fpformat.py,1.6,1.7 gopherlib.py,1.5,1.6 gzip.py,1.15,1.16 htmlentitydefs.py,1.4,1.5 imghdr.py,1.8,1.9 keyword.py,1.7,1.8 linecache.py,1.4,1.5 macpath.py,1.20,1.21 mailcap.py,1.4,1.5 mhlib.py,1.18,1.19 mimetools.py,1.15,1.16 mimify.py,1.13,1.14 multifile.py,1.8,1.9 mutex.py,1.5,1.6 netrc.py,1.3,1.4 nntplib.py,1.16,1.17 nturl2path.py,1.4,1.5 os.py,1.28,1.29 pdb.py,1.40,1.41 pickle.py,1.35,1.36 pipes.py,1.4,1.5 popen2.py,1.8,1.9 posixfile.py,1.12,1.13 posixpath.py,1.26,1.27 profile.py,1.21,1.22 pstats.py,1.6,1.7 pty.py,1.2,1.3 py_compile.py,1.14,1.15
Message-ID: <200002041510.KAA09691@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	dospath.py filecmp.py fpformat.py gopherlib.py gzip.py 
	htmlentitydefs.py imghdr.py keyword.py linecache.py macpath.py 
	mailcap.py mhlib.py mimetools.py mimify.py multifile.py 
	mutex.py netrc.py nntplib.py nturl2path.py os.py pdb.py 
	pickle.py pipes.py popen2.py posixfile.py posixpath.py 
	profile.py pstats.py pty.py py_compile.py 
Log Message:
More trivial comment -> docstring transformations by Ka-Ping Yee,
who writes:

Here is batch 2, as a big collection of CVS context diffs.
Along with moving comments into docstrings, i've added a
couple of missing docstrings and attempted to make sure more
module docstrings begin with a one-line summary.

I did not add docstrings to the methods in profile.py for
fear of upsetting any careful optimizations there, though
i did move class documentation into class docstrings.

The convention i'm using is to leave credits/version/copyright
type of stuff in # comments, and move the rest of the descriptive
stuff about module usage into module docstrings.  Hope this is
okay.



Index: dospath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/dospath.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** dospath.py	1999/03/19 21:05:12	1.10
--- dospath.py	2000/02/04 15:10:32	1.11
***************
*** 1,3 ****
! # Module 'dospath' -- common operations on DOS pathnames
  
  import os
--- 1,3 ----
! """Module 'dospath' -- common operations on DOS pathnames"""
  
  import os
***************
*** 6,63 ****
  
  
- # Normalize the case of a pathname.
- # On MS-DOS it maps the pathname to lowercase, turns slashes into
- # backslashes.
- # Other normalizations (such as optimizing '../' away) are not allowed
- # (this is done by normpath).
- # Previously, this version mapped invalid consecutive characters to a 
- # single '_', but this has been removed.  This functionality should 
- # possibly be added as a new function.
- 
  def normcase(s):
! 	return string.lower(string.replace(s, "/", "\\"))
  
  
- # Return wheter a path is absolute.
- # Trivial in Posix, harder on the Mac or MS-DOS.
- # For DOS it is absolute if it starts with a slash or backslash (current
- # volume), or if a pathname after the volume letter and colon starts with
- # a slash or backslash.
  
  def isabs(s):
! 	s = splitdrive(s)[1]
! 	return s != '' and s[:1] in '/\\'
  
  
- # Join two (or more) paths.
  
  def join(a, *p):
! 	path = a
! 	for b in p:
! 		if isabs(b):
! 			path = b
! 		elif path == '' or path[-1:] in '/\\':
! 			path = path + b
! 		else:
! 			path = path + os.sep + b
! 	return path
  
  
- # Split a path in a drive specification (a drive letter followed by a
- # colon) and the path specification.
- # It is always true that drivespec + pathspec == p
  
  def splitdrive(p):
! 	if p[1:2] == ':':
! 		return p[0:2], p[2:]
! 	return '', p
! 
  
- # Split a path in head (everything up to the last '/') and tail (the
- # rest).  After the trailing '/' is stripped, the invariant
- # join(head, tail) == p holds.
- # The resulting head won't end in '/' unless it is the root.
  
  def split(p):
      d, p = splitdrive(p)
      # set i to index beyond p's last slash
--- 6,63 ----
  
  
  def normcase(s):
!     """Normalize the case of a pathname.
!     On MS-DOS it maps the pathname to lowercase, turns slashes into
!     backslashes.
!     Other normalizations (such as optimizing '../' away) are not allowed
!     (this is done by normpath).
!     Previously, this version mapped invalid consecutive characters to a 
!     single '_', but this has been removed.  This functionality should 
!     possibly be added as a new function."""
  
+     return string.lower(string.replace(s, "/", "\\"))
  
  
  def isabs(s):
!     """Return whether a path is absolute.
!     Trivial in Posix, harder on the Mac or MS-DOS.
!     For DOS it is absolute if it starts with a slash or backslash (current
!     volume), or if a pathname after the volume letter and colon starts with
!     a slash or backslash."""
  
+     s = splitdrive(s)[1]
+     return s != '' and s[:1] in '/\\'
  
  
  def join(a, *p):
!     """Join two (or more) paths."""
  
+     path = a
+     for b in p:
+         if isabs(b):
+             path = b
+         elif path == '' or path[-1:] in '/\\':
+             path = path + b
+         else:
+             path = path + os.sep + b
+     return path
  
  
  def splitdrive(p):
!     """Split a path into a drive specification (a drive letter followed
!     by a colon) and path specification.
!     It is always true that drivespec + pathspec == p."""
! 
!     if p[1:2] == ':':
!         return p[0:2], p[2:]
!     return '', p
  
  
  def split(p):
+     """Split a path into head (everything up to the last '/') and tail
+     (the rest).  After the trailing '/' is stripped, the invariant
+     join(head, tail) == p holds.
+     The resulting head won't end in '/' unless it is the root."""
+ 
      d, p = splitdrive(p)
      # set i to index beyond p's last slash
***************
*** 74,118 ****
  
  
- # Split a path in root and extension.
- # The extension is everything starting at the first dot in the last
- # pathname component; the root is everything before that.
- # It is always true that root + ext == p.
- 
  def splitext(p):
! 	root, ext = '', ''
! 	for c in p:
! 		if c in '/\\':
! 			root, ext = root + ext + c, ''
! 		elif c == '.' or ext:
! 			ext = ext + c
! 		else:
! 			root = root + c
! 	return root, ext
! 
  
- # Return the tail (basename) part of a path.
  
  def basename(p):
! 	return split(p)[1]
  
  
- # Return the head (dirname) part of a path.
  
  def dirname(p):
! 	return split(p)[0]
  
  
- # Return the longest prefix of all list elements.
  
  def commonprefix(m):
! 	if not m: return ''
! 	prefix = m[0]
! 	for item in m:
! 		for i in range(len(prefix)):
! 			if prefix[:i+1] <> item[:i+1]:
! 				prefix = prefix[:i]
! 				if i == 0: return ''
! 				break
! 	return prefix
  
  
--- 74,118 ----
  
  
  def splitext(p):
!     """Split a path into root and extension.
!     The extension is everything starting at the first dot in the last
!     pathname component; the root is everything before that.
!     It is always true that root + ext == p."""
! 
!     root, ext = '', ''
!     for c in p:
!         if c in '/\\':
!             root, ext = root + ext + c, ''
!         elif c == '.' or ext:
!             ext = ext + c
!         else:
!             root = root + c
!     return root, ext
  
  
  def basename(p):
!     """Return the tail (basename) part of a path."""
  
+     return split(p)[1]
  
  
  def dirname(p):
!     """Return the head (dirname) part of a path."""
  
+     return split(p)[0]
  
  
  def commonprefix(m):
!     """Return the longest prefix of all list elements."""
! 
!     if not m: return ''
!     prefix = m[0]
!     for item in m:
!         for i in range(len(prefix)):
!             if prefix[:i+1] <> item[:i+1]:
!                 prefix = prefix[:i]
!                 if i == 0: return ''
!                 break
!     return prefix
  
  
***************
*** 135,332 ****
  
  
- # Is a path a symbolic link?
- # This will always return false on systems where posix.lstat doesn't exist.
- 
  def islink(path):
! 	return 0
  
  
- # Does a path exist?
- # This is false for dangling symbolic links.
  
  def exists(path):
! 	try:
! 		st = os.stat(path)
! 	except os.error:
! 		return 0
! 	return 1
  
  
- # Is a path a dos directory?
- # This follows symbolic links, so both islink() and isdir() can be true
- # for the same path.
  
  def isdir(path):
! 	try:
! 		st = os.stat(path)
! 	except os.error:
! 		return 0
! 	return stat.S_ISDIR(st[stat.ST_MODE])
  
  
- # Is a path a regular file?
- # This follows symbolic links, so both islink() and isdir() can be true
- # for the same path.
  
  def isfile(path):
! 	try:
! 		st = os.stat(path)
! 	except os.error:
! 		return 0
! 	return stat.S_ISREG(st[stat.ST_MODE])
  
  
- # Is a path a mount point?
- # XXX This degenerates in: 'is this the root?' on DOS
  
  def ismount(path):
! 	return isabs(splitdrive(path)[1])
  
  
- # Directory tree walk.
- # For each directory under top (including top itself, but excluding
- # '.' and '..'), func(arg, dirname, filenames) is called, where
- # dirname is the name of the directory and filenames is the list
- # files files (and subdirectories etc.) in the directory.
- # The func may modify the filenames list, to implement a filter,
- # or to impose a different order of visiting.
  
  def walk(top, func, arg):
! 	try:
! 		names = os.listdir(top)
! 	except os.error:
! 		return
! 	func(arg, top, names)
! 	exceptions = ('.', '..')
! 	for name in names:
! 		if name not in exceptions:
! 			name = join(top, name)
! 			if isdir(name):
! 				walk(name, func, arg)
! 
! 
! # Expand paths beginning with '~' or '~user'.
! # '~' means $HOME; '~user' means that user's home directory.
! # If the path doesn't begin with '~', or if the user or $HOME is unknown,
! # the path is returned unchanged (leaving error reporting to whatever
! # function is called with the expanded path as argument).
! # See also module 'glob' for expansion of *, ? and [...] in pathnames.
! # (A function should also be defined to do full *sh-style environment
! # variable expansion.)
  
  def expanduser(path):
! 	if path[:1] <> '~':
! 		return path
! 	i, n = 1, len(path)
! 	while i < n and path[i] not in '/\\':
! 		i = i+1
! 	if i == 1:
! 		if not os.environ.has_key('HOME'):
! 			return path
! 		userhome = os.environ['HOME']
! 	else:
! 		return path
! 	return userhome + path[i:]
! 
! 
! # Expand paths containing shell variable substitutions.
! # The following rules apply:
! #	- no expansion within single quotes
! #	- no escape character, except for '$$' which is translated into '$'
! #	- ${varname} is accepted.
! #	- varnames can be made out of letters, digits and the character '_'
! # XXX With COMMAND.COM you can use any characters in a variable name,
! # XXX except '^|<>='.
  
  varchars = string.letters + string.digits + '_-'
  
  def expandvars(path):
! 	if '$' not in path:
! 		return path
! 	res = ''
! 	index = 0
! 	pathlen = len(path)
! 	while index < pathlen:
! 		c = path[index]
! 		if c == '\'':	# no expansion within single quotes
! 			path = path[index + 1:]
! 			pathlen = len(path)
! 			try:
! 				index = string.index(path, '\'')
! 				res = res + '\'' + path[:index + 1]
! 			except string.index_error:
! 				res = res + path
! 				index = pathlen -1
! 		elif c == '$':	# variable or '$$'
! 			if path[index + 1:index + 2] == '$':
! 				res = res + c
! 				index = index + 1
! 			elif path[index + 1:index + 2] == '{':
! 				path = path[index+2:]
! 				pathlen = len(path)
! 				try:
! 					index = string.index(path, '}')
! 					var = path[:index]
! 					if os.environ.has_key(var):
! 						res = res + os.environ[var]
! 				except string.index_error:
! 					res = res + path
! 					index = pathlen - 1
! 			else:
! 				var = ''
! 				index = index + 1
! 				c = path[index:index + 1]
! 				while c != '' and c in varchars:
! 					var = var + c
! 					index = index + 1
! 					c = path[index:index + 1]
! 				if os.environ.has_key(var):
! 					res = res + os.environ[var]
! 				if c != '':
! 					res = res + c
! 		else:
! 			res = res + c
! 		index = index + 1
! 	return res
  
  
- # Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A/B.
- # Also, components of the path are silently truncated to 8+3 notation.
- 
  def normpath(path):
! 	path = string.replace(path, "/", "\\")
! 	prefix, path = splitdrive(path)
! 	while path[:1] == os.sep:
! 		prefix = prefix + os.sep
! 		path = path[1:]
! 	comps = string.splitfields(path, os.sep)
! 	i = 0
! 	while i < len(comps):
! 		if comps[i] == '.':
! 			del comps[i]
! 		elif comps[i] == '..' and i > 0 and \
! 					  comps[i-1] not in ('', '..'):
! 			del comps[i-1:i+1]
! 			i = i-1
! 		elif comps[i] == '' and i > 0 and comps[i-1] <> '':
! 			del comps[i]
! 		elif '.' in comps[i]:
! 			comp = string.splitfields(comps[i], '.')
! 			comps[i] = comp[0][:8] + '.' + comp[1][:3]
! 			i = i+1
! 		elif len(comps[i]) > 8:
! 			comps[i] = comps[i][:8]
! 			i = i+1
! 		else:
! 			i = i+1
! 	# If the path is now empty, substitute '.'
! 	if not prefix and not comps:
! 		comps.append('.')
! 	return prefix + string.joinfields(comps, os.sep)
  
  
  
- # Return an absolute path.
  def abspath(path):
      if not isabs(path):
          path = join(os.getcwd(), path)
--- 135,328 ----
  
  
  def islink(path):
!     """Is a path a symbolic link?
!     This will always return false on systems where posix.lstat doesn't exist."""
  
+     return 0
  
  
  def exists(path):
!     """Does a path exist?
!     This is false for dangling symbolic links."""
  
+     try:
+         st = os.stat(path)
+     except os.error:
+         return 0
+     return 1
  
  
  def isdir(path):
!     """Is a path a dos directory?"""
  
+     try:
+         st = os.stat(path)
+     except os.error:
+         return 0
+     return stat.S_ISDIR(st[stat.ST_MODE])
  
  
  def isfile(path):
!     """Is a path a regular file?"""
  
+     try:
+         st = os.stat(path)
+     except os.error:
+         return 0
+     return stat.S_ISREG(st[stat.ST_MODE])
  
  
  def ismount(path):
!     """Is a path a mount point?"""
!     # XXX This degenerates in: 'is this the root?' on DOS
  
+     return isabs(splitdrive(path)[1])
  
  
  def walk(top, func, arg):
!     """Directory tree walk.
!     For each directory under top (including top itself, but excluding
!     '.' and '..'), func(arg, dirname, filenames) is called, where
!     dirname is the name of the directory and filenames is the list
!     files files (and subdirectories etc.) in the directory.
!     The func may modify the filenames list, to implement a filter,
!     or to impose a different order of visiting."""
! 
!     try:
!         names = os.listdir(top)
!     except os.error:
!         return
!     func(arg, top, names)
!     exceptions = ('.', '..')
!     for name in names:
!         if name not in exceptions:
!             name = join(top, name)
!             if isdir(name):
!                 walk(name, func, arg)
! 
  
  def expanduser(path):
!     """Expand paths beginning with '~' or '~user'.
!     '~' means $HOME; '~user' means that user's home directory.
!     If the path doesn't begin with '~', or if the user or $HOME is unknown,
!     the path is returned unchanged (leaving error reporting to whatever
!     function is called with the expanded path as argument).
!     See also module 'glob' for expansion of *, ? and [...] in pathnames.
!     (A function should also be defined to do full *sh-style environment
!     variable expansion.)"""
! 
!     if path[:1] <> '~':
!         return path
!     i, n = 1, len(path)
!     while i < n and path[i] not in '/\\':
!         i = i+1
!     if i == 1:
!         if not os.environ.has_key('HOME'):
!             return path
!         userhome = os.environ['HOME']
!     else:
!         return path
!     return userhome + path[i:]
! 
  
  varchars = string.letters + string.digits + '_-'
  
  def expandvars(path):
!     """Expand paths containing shell variable substitutions.
!     The following rules apply:
!         - no expansion within single quotes
!         - no escape character, except for '$$' which is translated into '$'
!         - ${varname} is accepted.
!         - varnames can be made out of letters, digits and the character '_'"""
!     # XXX With COMMAND.COM you can use any characters in a variable name,
!     # XXX except '^|<>='.
! 
!     if '$' not in path:
!         return path
!     res = ''
!     index = 0
!     pathlen = len(path)
!     while index < pathlen:
!         c = path[index]
!         if c == '\'':   # no expansion within single quotes
!             path = path[index + 1:]
!             pathlen = len(path)
!             try:
!                 index = string.index(path, '\'')
!                 res = res + '\'' + path[:index + 1]
!             except string.index_error:
!                 res = res + path
!                 index = pathlen -1
!         elif c == '$':  # variable or '$$'
!             if path[index + 1:index + 2] == '$':
!                 res = res + c
!                 index = index + 1
!             elif path[index + 1:index + 2] == '{':
!                 path = path[index+2:]
!                 pathlen = len(path)
!                 try:
!                     index = string.index(path, '}')
!                     var = path[:index]
!                     if os.environ.has_key(var):
!                         res = res + os.environ[var]
!                 except string.index_error:
!                     res = res + path
!                     index = pathlen - 1
!             else:
!                 var = ''
!                 index = index + 1
!                 c = path[index:index + 1]
!                 while c != '' and c in varchars:
!                     var = var + c
!                     index = index + 1
!                     c = path[index:index + 1]
!                 if os.environ.has_key(var):
!                     res = res + os.environ[var]
!                 if c != '':
!                     res = res + c
!         else:
!             res = res + c
!         index = index + 1
!     return res
  
  
  def normpath(path):
!     """Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A/B.
!     Also, components of the path are silently truncated to 8+3 notation."""
! 
!     path = string.replace(path, "/", "\\")
!     prefix, path = splitdrive(path)
!     while path[:1] == os.sep:
!         prefix = prefix + os.sep
!         path = path[1:]
!     comps = string.splitfields(path, os.sep)
!     i = 0
!     while i < len(comps):
!         if comps[i] == '.':
!             del comps[i]
!         elif comps[i] == '..' and i > 0 and \
!                       comps[i-1] not in ('', '..'):
!             del comps[i-1:i+1]
!             i = i-1
!         elif comps[i] == '' and i > 0 and comps[i-1] <> '':
!             del comps[i]
!         elif '.' in comps[i]:
!             comp = string.splitfields(comps[i], '.')
!             comps[i] = comp[0][:8] + '.' + comp[1][:3]
!             i = i+1
!         elif len(comps[i]) > 8:
!             comps[i] = comps[i][:8]
!             i = i+1
!         else:
!             i = i+1
!     # If the path is now empty, substitute '.'
!     if not prefix and not comps:
!         comps.append('.')
!     return prefix + string.joinfields(comps, os.sep)
  
  
  
  def abspath(path):
+     """Return an absolute path."""
      if not isabs(path):
          path = join(os.getcwd(), path)

Index: filecmp.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/filecmp.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** filecmp.py	2000/02/03 00:41:22	1.2
--- filecmp.py	2000/02/04 15:10:32	1.3
***************
*** 1,318 ****
! """Utilities for comparing files and directories.
  
! Classes:
!     dircmp
  
- Functions:
-     cmp(f1, f2, shallow=1, use_statcache=0) -> int
-     cmpfiles(a, b, common) -> ([], [], [])
- 
- """
- 
- import os
- import stat
- import statcache
- 
  _cache = {}
  BUFSIZE=8*1024
  
! def cmp(f1, f2, shallow=1,use_statcache=0):
!     """Compare two files.
  
!     Arguments:
  
!     f1 -- First file name
  
!     f2 -- Second file name
  
!     shallow -- Just check stat signature (do not read the files).
!                defaults to 1.
  
!     use_statcache -- Do not stat() each file directly: go through
!                      the statcache module for more efficiency.
  
!     Return value:
  
!     integer -- 1 if the files are the same, 0 otherwise.
  
!     This function uses a cache for past comparisons and the results,
!     with a cache invalidation mechanism relying on stale signatures.
!     Of course, if 'use_statcache' is true, this mechanism is defeated,
!     and the cache will never grow stale.
  
!     """
!     stat_function = (os.stat, statcache.stat)[use_statcache]
!     s1, s2 = _sig(stat_function(f1)), _sig(stat_function(f2))
!     if s1[0]!=stat.S_IFREG or s2[0]!=stat.S_IFREG: return 0
!     if shallow and s1 == s2: return 1
!     if s1[1]!=s2[1]:         return 0
  
!     result = _cache.get((f1, f2))
!     if result and (s1, s2)==result[:2]:
!         return result[2]
!     outcome = _do_cmp(f1, f2)
!     _cache[f1, f2] = s1, s2, outcome
!     return outcome
  
  def _sig(st):
!     return (stat.S_IFMT(st[stat.ST_MODE]),
!             st[stat.ST_SIZE],
!             st[stat.ST_MTIME])
  
  def _do_cmp(f1, f2):
!     bufsize = BUFSIZE
!     fp1 , fp2 = open(f1, 'rb'), open(f2, 'rb')
!     while 1:
!         b1, b2 = fp1.read(bufsize), fp2.read(bufsize)
!         if b1!=b2: return 0
!         if not b1: return 1
! 
! # Directory comparison class.
! #
! class dircmp:
!     """A class that manages the comparison of 2 directories.
! 
!     dircmp(a,b,ignore=None,hide=None)
!       A and B are directories.
!       IGNORE is a list of names to ignore,
!         defaults to ['RCS', 'CVS', 'tags'].
!       HIDE is a list of names to hide,
!         defaults to [os.curdir, os.pardir].
! 
!     High level usage:
!       x = dircmp(dir1, dir2)
!       x.report() -> prints a report on the differences between dir1 and dir2
!        or
!       x.report_partial_closure() -> prints report on differences between dir1
!             and dir2, and reports on common immediate subdirectories.
!       x.report_full_closure() -> like report_partial_closure,
!             but fully recursive.
! 
!     Attributes:
!      left_list, right_list: The files in dir1 and dir2,
!         filtered by hide and ignore.
!      common: a list of names in both dir1 and dir2.
!      left_only, right_only: names only in dir1, dir2.
!      common_dirs: subdirectories in both dir1 and dir2.
!      common_files: files in both dir1 and dir2.
!      common_funny: names in both dir1 and dir2 where the type differs between
!         dir1 and dir2, or the name is not stat-able.
!      same_files: list of identical files.
!      diff_files: list of filenames which differ.
!      funny_files: list of files which could not be compared.
!      subdirs: a dictionary of dircmp objects, keyed by names in common_dirs.
!      """
! 
!     def __init__(self, a, b, ignore=None, hide=None): # Initialize
!         self.left = a
!         self.right = b
!         if hide is None:
!             self.hide = [os.curdir, os.pardir] # Names never to be shown
!         else:
!             self.hide = hide
!         if ignore is None:
!             self.ignore = ['RCS', 'CVS', 'tags'] # Names ignored in comparison
!         else:
!             self.ignore = ignore
! 
!     def phase0(self): # Compare everything except common subdirectories
!         self.left_list = _filter(os.listdir(self.left),
!                                  self.hide+self.ignore)
!         self.right_list = _filter(os.listdir(self.right),
!                                   self.hide+self.ignore)
!         self.left_list.sort()
!         self.right_list.sort()
! 
!     __p4_attrs = ('subdirs',)
!     __p3_attrs = ('same_files', 'diff_files', 'funny_files')
!     __p2_attrs = ('common_dirs', 'common_files', 'common_funny')
!     __p1_attrs = ('common', 'left_only', 'right_only')
!     __p0_attrs = ('left_list', 'right_list')
! 
!     def __getattr__(self, attr):
!         if attr in self.__p4_attrs:
!             self.phase4()
!         elif attr in self.__p3_attrs:
!             self.phase3()
!         elif attr in self.__p2_attrs:
!             self.phase2()
!         elif attr in self.__p1_attrs:
!             self.phase1()
!         elif attr in self.__p0_attrs:
!             self.phase0()
!         else:
!             raise AttributeError, attr
!         return getattr(self, attr)
! 
!     def phase1(self): # Compute common names
!         a_only, b_only = [], []
!         common = {}
!         b = {}
!         for fnm in self.right_list:
!             b[fnm] = 1
!         for x in self.left_list:
!             if b.get(x, 0):
!                 common[x] = 1
!             else:
!                 a_only.append(x)
!         for x in self.right_list:
!             if common.get(x, 0):
!                 pass
!             else:
!                 b_only.append(x)
!         self.common = common.keys()
!         self.left_only = a_only
!         self.right_only = b_only
! 
!     def phase2(self): # Distinguish files, directories, funnies
!         self.common_dirs = []
!         self.common_files = []
!         self.common_funny = []
! 
!         for x in self.common:
!             a_path = os.path.join(self.left, x)
!             b_path = os.path.join(self.right, x)
! 
!             ok = 1
!             try:
!                 a_stat = statcache.stat(a_path)
!             except os.error, why:
!                 # print 'Can\'t stat', a_path, ':', why[1]
!                 ok = 0
!             try:
!                 b_stat = statcache.stat(b_path)
!             except os.error, why:
!                 # print 'Can\'t stat', b_path, ':', why[1]
!                 ok = 0
! 
!             if ok:
!                 a_type = stat.S_IFMT(a_stat[stat.ST_MODE])
!                 b_type = stat.S_IFMT(b_stat[stat.ST_MODE])
!                 if a_type <> b_type:
!                     self.common_funny.append(x)
!                 elif stat.S_ISDIR(a_type):
!                     self.common_dirs.append(x)
!                 elif stat.S_ISREG(a_type):
!                     self.common_files.append(x)
!                 else:
!                     self.common_funny.append(x)
!             else:
!                 self.common_funny.append(x)
! 
!     def phase3(self): # Find out differences between common files
!         xx = cmpfiles(self.left, self.right, self.common_files)
!         self.same_files, self.diff_files, self.funny_files = xx
! 
!     def phase4(self): # Find out differences between common subdirectories
!         # A new dircmp object is created for each common subdirectory,
!         # these are stored in a dictionary indexed by filename.
!         # The hide and ignore properties are inherited from the parent
!         self.subdirs = {}
!         for x in self.common_dirs:
!             a_x = os.path.join(self.left, x)
!             b_x = os.path.join(self.right, x)
!             self.subdirs[x]  = dircmp(a_x, b_x, self.ignore, self.hide)
! 
!     def phase4_closure(self): # Recursively call phase4() on subdirectories
!         self.phase4()
!         for x in self.subdirs.keys():
!             self.subdirs[x].phase4_closure()
! 
!     def report(self): # Print a report on the differences between a and b
!         # Output format is purposely lousy
!         print 'diff', self.left, self.right
!         if self.left_only:
!             self.left_only.sort()
!             print 'Only in', self.left, ':', self.left_only
!         if self.right_only:
!             self.right_only.sort()
!             print 'Only in', self.right, ':', self.right_only
!         if self.same_files:
!             self.same_files.sort()
!             print 'Identical files :', self.same_files
!         if self.diff_files:
!             self.diff_files.sort()
!             print 'Differing files :', self.diff_files
!         if self.funny_files:
!             self.funny_files.sort()
!             print 'Trouble with common files :', self.funny_files
!         if self.common_dirs:
!             self.common_dirs.sort()
!             print 'Common subdirectories :', self.common_dirs
!         if self.common_funny:
!             self.common_funny.sort()
!             print 'Common funny cases :', self.common_funny
! 
!     def report_partial_closure(self): # Print reports on self and on subdirs
!         self.report()
!         for x in self.subdirs.keys():
!             print
!             self.subdirs[x].report()
! 
!     def report_full_closure(self): # Report on self and subdirs recursively
!         self.report()
!         for x in self.subdirs.keys():
!             print
!             self.subdirs[x].report_full_closure()
! 
! 
! # Compare common files in two directories.
! # Return:
! #	- files that compare equal
! #	- files that compare different
! #	- funny cases (can't stat etc.)
! #
! def cmpfiles(a, b, common):
!     """Compare common files in two directories.
! 
!     cmpfiles(a,b,common)
!       A and B are directory names
!       COMMON is a list of file names
!     returns a tuple of three lists:
!       files that compare equal
!       files that are different
!       filenames that aren't regular files."""
! 
!     res = ([], [], [])
!     for x in common:
!         res[_cmp(os.path.join(a, x), os.path.join(b, x))].append(x)
!     return res
! 
! 
! # Compare two files.
! # Return:
! #	0 for equal
! #	1 for different
! #	2 for funny cases (can't stat, etc.)
! #
! def _cmp(a, b):
!     try:
!         return not abs(cmp(a, b))
!     except os.error:
!         return 2
! 
! 
! # Return a copy with items that occur in skip removed.
! #
! def _filter(list, skip):
!     result = []
!     for item in list:
!         if item not in skip: result.append(item)
!     return result
! 
! 
! # Demonstration and testing.
! #
! def demo():
!     import sys
!     import getopt
!     options, args = getopt.getopt(sys.argv[1:], 'r')
!     if len(args) <> 2: raise getopt.error, 'need exactly two args'
!     dd = dircmp(args[0], args[1])
!     if ('-r', '') in options:
!         dd.report_full_closure()
!     else:
!         dd.report()
! 
! if __name__ == '__main__':
!     demo()
--- 1,57 ----
! """Compare files."""
  
! import os, stat, statcache
  
  _cache = {}
  BUFSIZE=8*1024
  
! def cmp(f1, f2, shallow=1,use_statcache=0): 
! 	"""Compare two files.
  
! 	Arguments:
  
! 	f1 -- First file name
  
! 	f2 -- Second file name
  
! 	shallow -- Just check stat signature (do not read the files).
! 	           defaults to 1.
  
! 	use_statcache -- Do not stat() each file directly: go through
! 	                 the statcache module for more efficiency.
  
! 	Return value:
  
! 	integer -- 1 if the files are the same, 0 otherwise.
  
! 	This function uses a cache for past comparisons and the results,
! 	with a cache invalidation mechanism relying on stale signatures.
! 	Of course, if 'use_statcache' is true, this mechanism is defeated,
! 	and the cache will never grow stale.
  
! 	"""
! 	stat_function = (os.stat, statcache.stat)[use_statcache]
! 	s1, s2 = _sig(stat_function(f1)), _sig(stat_function(f2))
! 	if s1[0]!=stat.S_IFREG or s2[0]!=stat.S_IFREG: return 0
! 	if shallow and s1 == s2: return 1
! 	if s1[1]!=s2[1]:         return 0
  
! 	result = _cache.get((f1, f2))
! 	if result and (s1, s2)==result[:2]:
! 		return result[2]
! 	outcome = _do_cmp(f1, f2)
! 	_cache[f1, f2] = s1, s2, outcome
! 	return outcome
  
  def _sig(st):
! 	return (stat.S_IFMT(st[stat.ST_MODE]), 
! 	        st[stat.ST_SIZE], 
! 	        st[stat.ST_MTIME])
  
  def _do_cmp(f1, f2):
! 	bufsize = BUFSIZE
! 	fp1 , fp2 = open(f1, 'rb'), open(f2, 'rb')
! 	while 1:
! 		b1, b2 = fp1.read(bufsize), fp2.read(bufsize)
! 		if b1!=b2: return 0
! 		if not b1: return 1

Index: fpformat.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/fpformat.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** fpformat.py	2000/02/02 15:10:13	1.6
--- fpformat.py	2000/02/04 15:10:32	1.7
***************
*** 23,141 ****
  
  try:
! 	class NotANumber(ValueError):
! 		pass
  except TypeError:
! 	NotANumber = 'fpformat.NotANumber'
  
- # Return (sign, intpart, fraction, expo) or raise an exception:
- # sign is '+' or '-'
- # intpart is 0 or more digits beginning with a nonzero
- # fraction is 0 or more digits
- # expo is an integer
  def extract(s):
! 	res = decoder.match(s)
! 	if res is None: raise NotANumber, s
! 	sign, intpart, fraction, exppart = res.group(1,2,3,4)
! 	if sign == '+': sign = ''
! 	if fraction: fraction = fraction[1:]
! 	if exppart: expo = int(exppart[1:])
! 	else: expo = 0
! 	return sign, intpart, fraction, expo
  
- # Remove the exponent by changing intpart and fraction
  def unexpo(intpart, fraction, expo):
! 	if expo > 0: # Move the point left
! 		f = len(fraction)
! 		intpart, fraction = intpart + fraction[:expo], fraction[expo:]
! 		if expo > f:
! 			intpart = intpart + '0'*(expo-f)
! 	elif expo < 0: # Move the point right
! 		i = len(intpart)
! 		intpart, fraction = intpart[:expo], intpart[expo:] + fraction
! 		if expo < -i:
! 			fraction = '0'*(-expo-i) + fraction
! 	return intpart, fraction
  
- # Round or extend the fraction to size digs
  def roundfrac(intpart, fraction, digs):
! 	f = len(fraction)
! 	if f <= digs:
! 		return intpart, fraction + '0'*(digs-f)
! 	i = len(intpart)
! 	if i+digs < 0:
! 		return '0'*-digs, ''
! 	total = intpart + fraction
! 	nextdigit = total[i+digs]
! 	if nextdigit >= '5': # Hard case: increment last digit, may have carry!
! 		n = i + digs - 1
! 		while n >= 0:
! 			if total[n] != '9': break
! 			n = n-1
! 		else:
! 			total = '0' + total
! 			i = i+1
! 			n = 0
! 		total = total[:n] + chr(ord(total[n]) + 1) + '0'*(len(total)-n-1)
! 		intpart, fraction = total[:i], total[i:]
! 	if digs >= 0:
! 		return intpart, fraction[:digs]
! 	else:
! 		return intpart[:digs] + '0'*-digs, ''
! 
! # Format x as [-]ddd.ddd with 'digs' digits after the point
! # and at least one digit before.
! # If digs <= 0, the point is suppressed.
  def fix(x, digs):
! 	if type(x) != type(''): x = `x`
! 	try:
! 		sign, intpart, fraction, expo = extract(x)
! 	except NotANumber:
! 		return x
! 	intpart, fraction = unexpo(intpart, fraction, expo)
! 	intpart, fraction = roundfrac(intpart, fraction, digs)
! 	while intpart and intpart[0] == '0': intpart = intpart[1:]
! 	if intpart == '': intpart = '0'
! 	if digs > 0: return sign + intpart + '.' + fraction
! 	else: return sign + intpart
! 
! # Format x as [-]d.dddE[+-]ddd with 'digs' digits after the point
! # and exactly one digit before.
! # If digs is <= 0, one digit is kept and the point is suppressed.
  def sci(x, digs):
! 	if type(x) != type(''): x = `x`
! 	sign, intpart, fraction, expo = extract(x)
! 	if not intpart:
! 		while fraction and fraction[0] == '0':
! 			fraction = fraction[1:]
! 			expo = expo - 1
! 		if fraction:
! 			intpart, fraction = fraction[0], fraction[1:]
! 			expo = expo - 1
! 		else:
! 			intpart = '0'
! 	else:
! 		expo = expo + len(intpart) - 1
! 		intpart, fraction = intpart[0], intpart[1:] + fraction
! 	digs = max(0, digs)
! 	intpart, fraction = roundfrac(intpart, fraction, digs)
! 	if len(intpart) > 1:
! 		intpart, fraction, expo = \
! 			intpart[0], intpart[1:] + fraction[:-1], \
! 			expo + len(intpart) - 1
! 	s = sign + intpart
! 	if digs > 0: s = s + '.' + fraction
! 	e = `abs(expo)`
! 	e = '0'*(3-len(e)) + e
! 	if expo < 0: e = '-' + e
! 	else: e = '+' + e
! 	return s + 'e' + e
  
- # Interactive test run
  def test():
! 	try:
! 		while 1:
! 			x, digs = input('Enter (x, digs): ')
! 			print x, fix(x, digs), sci(x, digs)
! 	except (EOFError, KeyboardInterrupt):
! 		pass
  
--- 23,141 ----
  
  try:
!     class NotANumber(ValueError):
!         pass
  except TypeError:
!     NotANumber = 'fpformat.NotANumber'
  
  def extract(s):
!     """Return (sign, intpart, fraction, expo) or raise an exception:
!     sign is '+' or '-'
!     intpart is 0 or more digits beginning with a nonzero
!     fraction is 0 or more digits
!     expo is an integer"""
!     res = decoder.match(s)
!     if res is None: raise NotANumber, s
!     sign, intpart, fraction, exppart = res.group(1,2,3,4)
!     if sign == '+': sign = ''
!     if fraction: fraction = fraction[1:]
!     if exppart: expo = int(exppart[1:])
!     else: expo = 0
!     return sign, intpart, fraction, expo
  
  def unexpo(intpart, fraction, expo):
!     """Remove the exponent by changing intpart and fraction."""
!     if expo > 0: # Move the point left
!         f = len(fraction)
!         intpart, fraction = intpart + fraction[:expo], fraction[expo:]
!         if expo > f:
!             intpart = intpart + '0'*(expo-f)
!     elif expo < 0: # Move the point right
!         i = len(intpart)
!         intpart, fraction = intpart[:expo], intpart[expo:] + fraction
!         if expo < -i:
!             fraction = '0'*(-expo-i) + fraction
!     return intpart, fraction
  
  def roundfrac(intpart, fraction, digs):
!     """Round or extend the fraction to size digs."""
!     f = len(fraction)
!     if f <= digs:
!         return intpart, fraction + '0'*(digs-f)
!     i = len(intpart)
!     if i+digs < 0:
!         return '0'*-digs, ''
!     total = intpart + fraction
!     nextdigit = total[i+digs]
!     if nextdigit >= '5': # Hard case: increment last digit, may have carry!
!         n = i + digs - 1
!         while n >= 0:
!             if total[n] != '9': break
!             n = n-1
!         else:
!             total = '0' + total
!             i = i+1
!             n = 0
!         total = total[:n] + chr(ord(total[n]) + 1) + '0'*(len(total)-n-1)
!         intpart, fraction = total[:i], total[i:]
!     if digs >= 0:
!         return intpart, fraction[:digs]
!     else:
!         return intpart[:digs] + '0'*-digs, ''
! 
  def fix(x, digs):
!     """Format x as [-]ddd.ddd with 'digs' digits after the point
!     and at least one digit before.
!     If digs <= 0, the point is suppressed."""
!     if type(x) != type(''): x = `x`
!     try:
!         sign, intpart, fraction, expo = extract(x)
!     except NotANumber:
!         return x
!     intpart, fraction = unexpo(intpart, fraction, expo)
!     intpart, fraction = roundfrac(intpart, fraction, digs)
!     while intpart and intpart[0] == '0': intpart = intpart[1:]
!     if intpart == '': intpart = '0'
!     if digs > 0: return sign + intpart + '.' + fraction
!     else: return sign + intpart
! 
  def sci(x, digs):
!     """Format x as [-]d.dddE[+-]ddd with 'digs' digits after the point
!     and exactly one digit before.
!     If digs is <= 0, one digit is kept and the point is suppressed."""
!     if type(x) != type(''): x = `x`
!     sign, intpart, fraction, expo = extract(x)
!     if not intpart:
!         while fraction and fraction[0] == '0':
!             fraction = fraction[1:]
!             expo = expo - 1
!         if fraction:
!             intpart, fraction = fraction[0], fraction[1:]
!             expo = expo - 1
!         else:
!             intpart = '0'
!     else:
!         expo = expo + len(intpart) - 1
!         intpart, fraction = intpart[0], intpart[1:] + fraction
!     digs = max(0, digs)
!     intpart, fraction = roundfrac(intpart, fraction, digs)
!     if len(intpart) > 1:
!         intpart, fraction, expo = \
!             intpart[0], intpart[1:] + fraction[:-1], \
!             expo + len(intpart) - 1
!     s = sign + intpart
!     if digs > 0: s = s + '.' + fraction
!     e = `abs(expo)`
!     e = '0'*(3-len(e)) + e
!     if expo < 0: e = '-' + e
!     else: e = '+' + e
!     return s + 'e' + e
  
  def test():
!     """Interactive test run."""
!     try:
!         while 1:
!             x, digs = input('Enter (x, digs): ')
!             print x, fix(x, digs), sci(x, digs)
!     except (EOFError, KeyboardInterrupt):
!         pass
  

Index: gopherlib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/gopherlib.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** gopherlib.py	1998/03/26 20:43:41	1.5
--- gopherlib.py	2000/02/04 15:10:32	1.6
***************
*** 1,3 ****
! # Gopher protocol client interface
  
  import string
--- 1,3 ----
! """Gopher protocol client interface."""
  
  import string
***************
*** 30,35 ****
  A_QUERY      = 'q'
  A_GIF        = 'g'
! A_HTML       = 'h'			# HTML file
! A_WWW        = 'w'			# WWW address
  A_PLUS_IMAGE = ':'
  A_PLUS_MOVIE = ';'
--- 30,35 ----
  A_QUERY      = 'q'
  A_GIF        = 'g'
! A_HTML       = 'h'          # HTML file
! A_WWW        = 'w'          # WWW address
  A_PLUS_IMAGE = ':'
  A_PLUS_MOVIE = ';'
***************
*** 37,52 ****
  
  
- # Function mapping all file types to strings; unknown types become TYPE='x'
  _names = dir()
  _type_to_name_map = {}
  def type_to_name(gtype):
! 	global _type_to_name_map
! 	if _type_to_name_map=={}:
! 		for name in _names:
! 			if name[:2] == 'A_':
! 				_type_to_name_map[eval(name)] = name[2:]
! 	if _type_to_name_map.has_key(gtype):
! 		return _type_to_name_map[gtype]
! 	return 'TYPE=' + `gtype`
  
  # Names for characters and strings
--- 37,52 ----
  
  
  _names = dir()
  _type_to_name_map = {}
  def type_to_name(gtype):
!     """Map all file types to strings; unknown types become TYPE='x'."""
!     global _type_to_name_map
!     if _type_to_name_map=={}:
!         for name in _names:
!             if name[:2] == 'A_':
!                 _type_to_name_map[eval(name)] = name[2:]
!     if _type_to_name_map.has_key(gtype):
!         return _type_to_name_map[gtype]
!     return 'TYPE=' + `gtype`
  
  # Names for characters and strings
***************
*** 54,208 ****
  TAB = '\t'
  
- # Send a selector to a given host and port, return a file with the reply
  def send_selector(selector, host, port = 0):
! 	import socket
! 	import string
! 	if not port:
! 		i = string.find(host, ':')
! 		if i >= 0:
! 			host, port = host[:i], string.atoi(host[i+1:])
! 	if not port:
! 		port = DEF_PORT
! 	elif type(port) == type(''):
! 		port = string.atoi(port)
! 	s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
! 	s.connect(host, port)
! 	s.send(selector + CRLF)
! 	s.shutdown(1)
! 	return s.makefile('rb')
  
- # Send a selector and a query string
  def send_query(selector, query, host, port = 0):
! 	return send_selector(selector + '\t' + query, host, port)
  
- # Takes a path as returned by urlparse and returns the appropriate selector
  def path_to_selector(path):
! 	if path=="/":
! 		return "/"
! 	else:
! 		return path[2:] # Cuts initial slash and data type identifier
  
- # Takes a path as returned by urlparse and maps it to a string
- # See section 3.4 of RFC 1738 for details
  def path_to_datatype_name(path):
! 	if path=="/":
! 		# No way to tell, although "INDEX" is likely
! 		return "TYPE='unknown'"
! 	else:
! 		return type_to_name(path[1])
  
  # The following functions interpret the data returned by the gopher
  # server according to the expected type, e.g. textfile or directory
  
- # Get a directory in the form of a list of entries
  def get_directory(f):
! 	import string
! 	list = []
! 	while 1:
! 		line = f.readline()
! 		if not line:
! 			print '(Unexpected EOF from server)'
! 			break
! 		if line[-2:] == CRLF:
! 			line = line[:-2]
! 		elif line[-1:] in CRLF:
! 			line = line[:-1]
! 		if line == '.':
! 			break
! 		if not line:
! 			print '(Empty line from server)'
! 			continue
! 		gtype = line[0]
! 		parts = string.splitfields(line[1:], TAB)
! 		if len(parts) < 4:
! 			print '(Bad line from server:', `line`, ')'
! 			continue
! 		if len(parts) > 4:
! 			if parts[4:] != ['+']:
! 				print '(Extra info from server:',
! 				print parts[4:], ')'
! 		else:
! 			parts.append('')
! 		parts.insert(0, gtype)
! 		list.append(parts)
! 	return list
  
- # Get a text file as a list of lines, with trailing CRLF stripped
  def get_textfile(f):
! 	list = []
! 	get_alt_textfile(f, list.append)
! 	return list
  
- # Get a text file and pass each line to a function, with trailing CRLF stripped
  def get_alt_textfile(f, func):
! 	while 1:
! 		line = f.readline()
! 		if not line:
! 			print '(Unexpected EOF from server)'
! 			break
! 		if line[-2:] == CRLF:
! 			line = line[:-2]
! 		elif line[-1:] in CRLF:
! 			line = line[:-1]
! 		if line == '.':
! 			break
! 		if line[:2] == '..':
! 			line = line[1:]
! 		func(line)
  
- # Get a binary file as one solid data block
  def get_binary(f):
! 	data = f.read()
! 	return data
  
- # Get a binary file and pass each block to a function
  def get_alt_binary(f, func, blocksize):
! 	while 1:
! 		data = f.read(blocksize)
! 		if not data:
! 			break
! 		func(data)
  
- # Trivial test program
  def test():
! 	import sys
! 	import getopt
! 	opts, args = getopt.getopt(sys.argv[1:], '')
! 	selector = DEF_SELECTOR
! 	type = selector[0]
! 	host = DEF_HOST
! 	port = DEF_PORT
! 	if args:
! 		host = args[0]
! 		args = args[1:]
! 	if args:
! 		type = args[0]
! 		args = args[1:]
! 		if len(type) > 1:
! 			type, selector = type[0], type
! 		else:
! 			selector = ''
! 			if args:
! 				selector = args[0]
! 				args = args[1:]
! 		query = ''
! 		if args:
! 			query = args[0]
! 			args = args[1:]
! 	if type == A_INDEX:
! 		f = send_query(selector, query, host)
! 	else:
! 		f = send_selector(selector, host)
! 	if type == A_TEXT:
! 		list = get_textfile(f)
! 		for item in list: print item
! 	elif type in (A_MENU, A_INDEX):
! 		list = get_directory(f)
! 		for item in list: print item
! 	else:
! 		data = get_binary(f)
! 		print 'binary data:', len(data), 'bytes:', `data[:100]`[:40]
  
  # Run the test when run as script
  if __name__ == '__main__':
! 	test()
--- 54,208 ----
  TAB = '\t'
  
  def send_selector(selector, host, port = 0):
!     """Send a selector to a given host and port, return a file with the reply."""
!     import socket
!     import string
!     if not port:
!         i = string.find(host, ':')
!         if i >= 0:
!             host, port = host[:i], string.atoi(host[i+1:])
!     if not port:
!         port = DEF_PORT
!     elif type(port) == type(''):
!         port = string.atoi(port)
!     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
!     s.connect(host, port)
!     s.send(selector + CRLF)
!     s.shutdown(1)
!     return s.makefile('rb')
  
  def send_query(selector, query, host, port = 0):
!     """Send a selector and a query string."""
!     return send_selector(selector + '\t' + query, host, port)
  
  def path_to_selector(path):
!     """Takes a path as returned by urlparse and returns the appropriate selector."""
!     if path=="/":
!         return "/"
!     else:
!         return path[2:] # Cuts initial slash and data type identifier
  
  def path_to_datatype_name(path):
!     """Takes a path as returned by urlparse and maps it to a string.
!     See section 3.4 of RFC 1738 for details."""
!     if path=="/":
!         # No way to tell, although "INDEX" is likely
!         return "TYPE='unknown'"
!     else:
!         return type_to_name(path[1])
  
  # The following functions interpret the data returned by the gopher
  # server according to the expected type, e.g. textfile or directory
  
  def get_directory(f):
!     """Get a directory in the form of a list of entries."""
!     import string
!     list = []
!     while 1:
!         line = f.readline()
!         if not line:
!             print '(Unexpected EOF from server)'
!             break
!         if line[-2:] == CRLF:
!             line = line[:-2]
!         elif line[-1:] in CRLF:
!             line = line[:-1]
!         if line == '.':
!             break
!         if not line:
!             print '(Empty line from server)'
!             continue
!         gtype = line[0]
!         parts = string.splitfields(line[1:], TAB)
!         if len(parts) < 4:
!             print '(Bad line from server:', `line`, ')'
!             continue
!         if len(parts) > 4:
!             if parts[4:] != ['+']:
!                 print '(Extra info from server:',
!                 print parts[4:], ')'
!         else:
!             parts.append('')
!         parts.insert(0, gtype)
!         list.append(parts)
!     return list
  
  def get_textfile(f):
!     """Get a text file as a list of lines, with trailing CRLF stripped."""
!     list = []
!     get_alt_textfile(f, list.append)
!     return list
  
  def get_alt_textfile(f, func):
!     """Get a text file and pass each line to a function, with trailing CRLF stripped."""
!     while 1:
!         line = f.readline()
!         if not line:
!             print '(Unexpected EOF from server)'
!             break
!         if line[-2:] == CRLF:
!             line = line[:-2]
!         elif line[-1:] in CRLF:
!             line = line[:-1]
!         if line == '.':
!             break
!         if line[:2] == '..':
!             line = line[1:]
!         func(line)
  
  def get_binary(f):
!     """Get a binary file as one solid data block."""
!     data = f.read()
!     return data
  
  def get_alt_binary(f, func, blocksize):
!     """Get a binary file and pass each block to a function."""
!     while 1:
!         data = f.read(blocksize)
!         if not data:
!             break
!         func(data)
  
  def test():
!     """Trivial test program."""
!     import sys
!     import getopt
!     opts, args = getopt.getopt(sys.argv[1:], '')
!     selector = DEF_SELECTOR
!     type = selector[0]
!     host = DEF_HOST
!     port = DEF_PORT
!     if args:
!         host = args[0]
!         args = args[1:]
!     if args:
!         type = args[0]
!         args = args[1:]
!         if len(type) > 1:
!             type, selector = type[0], type
!         else:
!             selector = ''
!             if args:
!                 selector = args[0]
!                 args = args[1:]
!         query = ''
!         if args:
!             query = args[0]
!             args = args[1:]
!     if type == A_INDEX:
!         f = send_query(selector, query, host)
!     else:
!         f = send_selector(selector, host)
!     if type == A_TEXT:
!         list = get_textfile(f)
!         for item in list: print item
!     elif type in (A_MENU, A_INDEX):
!         list = get_directory(f)
!         for item in list: print item
!     else:
!         data = get_binary(f)
!         print 'binary data:', len(data), 'bytes:', `data[:100]`[:40]
  
  # Run the test when run as script
  if __name__ == '__main__':
!     test()

Index: gzip.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/gzip.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** gzip.py	2000/02/02 16:51:06	1.15
--- gzip.py	2000/02/04 15:10:32	1.16
***************
*** 1,2 ****
--- 1,8 ----
+ """This module implements a function that reads and writes a gzipped file.
+ The user of the file doesn't have to worry about the compression,
+ but random access is not allowed."""
+ 
+ # based on Andrew Kuchling's minigzip.py distributed with the zlib module
+ 
  import time
  import string
***************
*** 4,13 ****
  import struct
  import __builtin__
- 
- # implements a python function that reads and writes a gzipped file
- # the user of the file doesn't have to worry about the compression,
- # but random access is not allowed
- 
- # based on Andrew Kuchling's minigzip.py distributed with the zlib module
  
  FTEXT, FHCRC, FEXTRA, FNAME, FCOMMENT = 1, 2, 4, 8, 16
--- 10,13 ----

Index: htmlentitydefs.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/htmlentitydefs.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** htmlentitydefs.py	1999/08/19 15:59:35	1.4
--- htmlentitydefs.py	2000/02/04 15:10:33	1.5
***************
*** 1,2 ****
--- 1,4 ----
+ """HTML character entity references."""
+ 
  entitydefs = {
      'AElig':	'\306',  	# latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1

Index: imghdr.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imghdr.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** imghdr.py	1997/10/08 15:22:32	1.8
--- imghdr.py	2000/02/04 15:10:33	1.9
***************
*** 1,3 ****
! # Recognizing image files based on their first few bytes.
  
  
--- 1,3 ----
! """Recognize image file formats based on their first few bytes."""
  
  
***************
*** 7,29 ****
  
  def what(file, h=None):
! 	if h is None:
! 		if type(file) == type(''):
! 			f = open(file, 'rb')
! 			h = f.read(32)
! 		else:
! 			location = file.tell()
! 			h = file.read(32)
! 			file.seek(location)
! 			f = None	
! 	else:
! 		f = None
! 	try:
! 		for tf in tests:
! 			res = tf(h, f)
! 			if res:
! 				return res
! 	finally:
! 		if f: f.close()
! 	return None
  
  
--- 7,29 ----
  
  def what(file, h=None):
!     if h is None:
!         if type(file) == type(''):
!             f = open(file, 'rb')
!             h = f.read(32)
!         else:
!             location = file.tell()
!             h = file.read(32)
!             file.seek(location)
!             f = None    
!     else:
!         f = None
!     try:
!         for tf in tests:
!             res = tf(h, f)
!             if res:
!                 return res
!     finally:
!         if f: f.close()
!     return None
  
  
***************
*** 35,113 ****
  
  def test_rgb(h, f):
! 	# SGI image library
! 	if h[:2] == '\001\332':
! 		return 'rgb'
  
  tests.append(test_rgb)
  
  def test_gif(h, f):
! 	# GIF ('87 and '89 variants)
! 	if h[:6] in ('GIF87a', 'GIF89a'):
! 		return 'gif'
  
  tests.append(test_gif)
  
  def test_pbm(h, f):
! 	# PBM (portable bitmap)
! 	if len(h) >= 3 and \
! 		h[0] == 'P' and h[1] in '14' and h[2] in ' \t\n\r':
! 		return 'pbm'
  
  tests.append(test_pbm)
  
  def test_pgm(h, f):
! 	# PGM (portable graymap)
! 	if len(h) >= 3 and \
! 		h[0] == 'P' and h[1] in '25' and h[2] in ' \t\n\r':
! 		return 'pgm'
  
  tests.append(test_pgm)
  
  def test_ppm(h, f):
! 	# PPM (portable pixmap)
! 	if len(h) >= 3 and \
! 		h[0] == 'P' and h[1] in '36' and h[2] in ' \t\n\r':
! 		return 'ppm'
  
  tests.append(test_ppm)
  
  def test_tiff(h, f):
! 	# TIFF (can be in Motorola or Intel byte order)
! 	if h[:2] in ('MM', 'II'):
! 		return 'tiff'
  
  tests.append(test_tiff)
  
  def test_rast(h, f):
! 	# Sun raster file
! 	if h[:4] == '\x59\xA6\x6A\x95':
! 		return 'rast'
  
  tests.append(test_rast)
  
  def test_xbm(h, f):
! 	# X bitmap (X10 or X11)
! 	s = '#define '
! 	if h[:len(s)] == s:
! 		return 'xbm'
  
  tests.append(test_xbm)
  
  def test_jpeg(h, f):
! 	# JPEG data in JFIF format
! 	if h[6:10] == 'JFIF':
! 		return 'jpeg'
  
  tests.append(test_jpeg)
  
  def test_bmp(h, f):
! 	if h[:2] == 'BM':
! 		return 'bmp'
! 		
  tests.append(test_bmp)
  
  def test_png(h, f):
! 	if h[:8] == "\211PNG\r\n\032\n":
! 		return 'png'
  
  tests.append(test_png)
--- 35,113 ----
  
  def test_rgb(h, f):
!     """SGI image library"""
!     if h[:2] == '\001\332':
!         return 'rgb'
  
  tests.append(test_rgb)
  
  def test_gif(h, f):
!     """GIF ('87 and '89 variants)"""
!     if h[:6] in ('GIF87a', 'GIF89a'):
!         return 'gif'
  
  tests.append(test_gif)
  
  def test_pbm(h, f):
!     """PBM (portable bitmap)"""
!     if len(h) >= 3 and \
!         h[0] == 'P' and h[1] in '14' and h[2] in ' \t\n\r':
!         return 'pbm'
  
  tests.append(test_pbm)
  
  def test_pgm(h, f):
!     """PGM (portable graymap)"""
!     if len(h) >= 3 and \
!         h[0] == 'P' and h[1] in '25' and h[2] in ' \t\n\r':
!         return 'pgm'
  
  tests.append(test_pgm)
  
  def test_ppm(h, f):
!     """PPM (portable pixmap)"""
!     if len(h) >= 3 and \
!         h[0] == 'P' and h[1] in '36' and h[2] in ' \t\n\r':
!         return 'ppm'
  
  tests.append(test_ppm)
  
  def test_tiff(h, f):
!     """TIFF (can be in Motorola or Intel byte order)"""
!     if h[:2] in ('MM', 'II'):
!         return 'tiff'
  
  tests.append(test_tiff)
  
  def test_rast(h, f):
!     """Sun raster file"""
!     if h[:4] == '\x59\xA6\x6A\x95':
!         return 'rast'
  
  tests.append(test_rast)
  
  def test_xbm(h, f):
!     """X bitmap (X10 or X11)"""
!     s = '#define '
!     if h[:len(s)] == s:
!         return 'xbm'
  
  tests.append(test_xbm)
  
  def test_jpeg(h, f):
!     """JPEG data in JFIF format"""
!     if h[6:10] == 'JFIF':
!         return 'jpeg'
  
  tests.append(test_jpeg)
  
  def test_bmp(h, f):
!     if h[:2] == 'BM':
!         return 'bmp'
!         
  tests.append(test_bmp)
  
  def test_png(h, f):
!     if h[:8] == "\211PNG\r\n\032\n":
!         return 'png'
  
  tests.append(test_png)
***************
*** 118,153 ****
  
  def test():
! 	import sys
! 	recursive = 0
! 	if sys.argv[1:] and sys.argv[1] == '-r':
! 		del sys.argv[1:2]
! 		recursive = 1
! 	try:
! 		if sys.argv[1:]:
! 			testall(sys.argv[1:], recursive, 1)
! 		else:
! 			testall(['.'], recursive, 1)
! 	except KeyboardInterrupt:
! 		sys.stderr.write('\n[Interrupted]\n')
! 		sys.exit(1)
  
  def testall(list, recursive, toplevel):
! 	import sys
! 	import os
! 	for filename in list:
! 		if os.path.isdir(filename):
! 			print filename + '/:',
! 			if recursive or toplevel:
! 				print 'recursing down:'
! 				import glob
! 				names = glob.glob(os.path.join(filename, '*'))
! 				testall(names, recursive, 0)
! 			else:
! 				print '*** directory (use -r) ***'
! 		else:
! 			print filename + ':',
! 			sys.stdout.flush()
! 			try:
! 				print what(filename)
! 			except IOError:
! 				print '*** not found ***'
--- 118,153 ----
  
  def test():
!     import sys
!     recursive = 0
!     if sys.argv[1:] and sys.argv[1] == '-r':
!         del sys.argv[1:2]
!         recursive = 1
!     try:
!         if sys.argv[1:]:
!             testall(sys.argv[1:], recursive, 1)
!         else:
!             testall(['.'], recursive, 1)
!     except KeyboardInterrupt:
!         sys.stderr.write('\n[Interrupted]\n')
!         sys.exit(1)
  
  def testall(list, recursive, toplevel):
!     import sys
!     import os
!     for filename in list:
!         if os.path.isdir(filename):
!             print filename + '/:',
!             if recursive or toplevel:
!                 print 'recursing down:'
!                 import glob
!                 names = glob.glob(os.path.join(filename, '*'))
!                 testall(names, recursive, 0)
!             else:
!                 print '*** directory (use -r) ***'
!         else:
!             print filename + ':',
!             sys.stdout.flush()
!             try:
!                 print what(filename)
!             except IOError:
!                 print '*** not found ***'

Index: keyword.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/keyword.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** keyword.py	1998/03/26 21:12:18	1.7
--- keyword.py	2000/02/04 15:10:33	1.8
***************
*** 1,12 ****
  #! /usr/bin/env python
! #
! #  Keywords (from "graminit.c")
! #
! #  This file is automatically generated; please don't muck it up!
! #
! #  To update the symbols in this file, 'cd' to the top directory of
! #  the python source tree after building the interpreter and run:
! #
! #    python Lib/keyword.py
  
  kwlist = [
--- 1,13 ----
  #! /usr/bin/env python
! 
! """Keywords (from "graminit.c")
! 
! This file is automatically generated; please don't muck it up!
! 
! To update the symbols in this file, 'cd' to the top directory of
! the python source tree after building the interpreter and run:
! 
!     python Lib/keyword.py
! """
  
  kwlist = [

Index: linecache.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/linecache.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** linecache.py	1995/08/10 19:32:22	1.4
--- linecache.py	2000/02/04 15:10:33	1.5
***************
*** 1,7 ****
! # Cache lines from files.
! # This is intended to read lines from modules imported -- hence if a filename
! # is not found, it will look down the module search path for a file by
! # that name.
  
  import sys
  import os
--- 1,9 ----
! """Cache lines from files.
  
+ This is intended to read lines from modules imported -- hence if a filename
+ is not found, it will look down the module search path for a file by
+ that name.
+ """
+ 
  import sys
  import os
***************
*** 9,17 ****
  
  def getline(filename, lineno):
! 	lines = getlines(filename)
! 	if 1 <= lineno <= len(lines):
! 		return lines[lineno-1]
! 	else:
! 		return ''
  
  
--- 11,19 ----
  
  def getline(filename, lineno):
!     lines = getlines(filename)
!     if 1 <= lineno <= len(lines):
!         return lines[lineno-1]
!     else:
!         return ''
  
  
***************
*** 21,90 ****
  
  
- # Clear the cache entirely
- 
  def clearcache():
! 	global cache
! 	cache = {}
  
  
- # Get the lines for a file from the cache.
- # Update the cache if it doesn't contain an entry for this file already.
  
  def getlines(filename):
! 	if cache.has_key(filename):
! 		return cache[filename][2]
! 	else:
! 		return updatecache(filename)
  
  
- # Discard cache entries that are out of date.
- # (This is not checked upon each call!)
  
  def checkcache():
! 	for filename in cache.keys():
! 		size, mtime, lines, fullname = cache[filename]
! 		try:
! 			stat = os.stat(fullname)
! 		except os.error:
! 			del cache[filename]
! 			continue
! 		if size <> stat[ST_SIZE] or mtime <> stat[ST_MTIME]:
! 			del cache[filename]
  
  
- # Update a cache entry and return its list of lines.
- # If something's wrong, print a message, discard the cache entry,
- # and return an empty list.
  
  def updatecache(filename):
! 	if cache.has_key(filename):
! 		del cache[filename]
! 	if not filename or filename[0] + filename[-1] == '<>':
! 		return []
! 	fullname = filename
! 	try:
! 		stat = os.stat(fullname)
! 	except os.error, msg:
! 		# Try looking through the module search path
! 		basename = os.path.split(filename)[1]
! 		for dirname in sys.path:
! 			fullname = os.path.join(dirname, basename)
! 			try:
! 				stat = os.stat(fullname)
! 				break
! 			except os.error:
! 				pass
! 		else:
! 			# No luck
! ##			print '*** Cannot stat', filename, ':', msg
! 			return []
! 	try:
! 		fp = open(fullname, 'r')
! 		lines = fp.readlines()
! 		fp.close()
! 	except IOError, msg:
! ##		print '*** Cannot open', fullname, ':', msg
! 		return []
! 	size, mtime = stat[ST_SIZE], stat[ST_MTIME]
! 	cache[filename] = size, mtime, lines, fullname
! 	return lines
--- 23,92 ----
  
  
  def clearcache():
!     """Clear the cache entirely."""
  
+     global cache
+     cache = {}
  
  
  def getlines(filename):
!     """Get the lines for a file from the cache.
!     Update the cache if it doesn't contain an entry for this file already."""
  
+     if cache.has_key(filename):
+         return cache[filename][2]
+     else:
+         return updatecache(filename)
  
  
  def checkcache():
!     """Discard cache entries that are out of date.
!     (This is not checked upon each call!)"""
  
+     for filename in cache.keys():
+         size, mtime, lines, fullname = cache[filename]
+         try:
+             stat = os.stat(fullname)
+         except os.error:
+             del cache[filename]
+             continue
+         if size <> stat[ST_SIZE] or mtime <> stat[ST_MTIME]:
+             del cache[filename]
  
  
  def updatecache(filename):
!     """Update a cache entry and return its list of lines.
!     If something's wrong, print a message, discard the cache entry,
!     and return an empty list."""
! 
!     if cache.has_key(filename):
!         del cache[filename]
!     if not filename or filename[0] + filename[-1] == '<>':
!         return []
!     fullname = filename
!     try:
!         stat = os.stat(fullname)
!     except os.error, msg:
!         # Try looking through the module search path
!         basename = os.path.split(filename)[1]
!         for dirname in sys.path:
!             fullname = os.path.join(dirname, basename)
!             try:
!                 stat = os.stat(fullname)
!                 break
!             except os.error:
!                 pass
!         else:
!             # No luck
! ##          print '*** Cannot stat', filename, ':', msg
!             return []
!     try:
!         fp = open(fullname, 'r')
!         lines = fp.readlines()
!         fp.close()
!     except IOError, msg:
! ##      print '*** Cannot open', fullname, ':', msg
!         return []
!     size, mtime = stat[ST_SIZE], stat[ST_MTIME]
!     cache[filename] = size, mtime, lines, fullname
!     return lines

Index: macpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/macpath.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** macpath.py	1999/07/23 15:04:05	1.20
--- macpath.py	2000/02/04 15:10:33	1.21
***************
*** 1,3 ****
! # module 'macpath' -- pathname (or -related) operations for the Macintosh
  
  import string
--- 1,3 ----
! """Pathname and path-related operations for the Macintosh."""
  
  import string
***************
*** 11,85 ****
  
  
- # Return true if a path is absolute.
- # On the Mac, relative paths begin with a colon,
- # but as a special case, paths with no colons at all are also relative.
- # Anything else is absolute (the string up to the first colon is the
- # volume name).
- 
  def isabs(s):
! 	return ':' in s and s[0] <> ':'
  
  
  def join(s, *p):
! 	path = s
! 	for t in p:
! 		if (not s) or isabs(t):
! 			path = t
! 			continue
! 		if t[:1] == ':':
! 			t = t[1:]
! 		if ':' not in path:
! 			path = ':' + path
! 		if path[-1:] <> ':':
! 			path = path + ':'
! 		path = path + t
! 	return path
! 
! 
! # Split a pathname in two parts: the directory leading up to the final bit,
! # and the basename (the filename, without colons, in that directory).
! # The result (s, t) is such that join(s, t) yields the original argument.
  
- def split(s):
- 	if ':' not in s: return '', s
- 	colon = 0
- 	for i in range(len(s)):
- 		if s[i] == ':': colon = i+1
- 	path, file = s[:colon-1], s[colon:]
- 	if path and not ':' in path:
- 		path = path + ':'
- 	return path, file
  
  
- # Split a path in root and extension.
- # The extension is everything starting at the last dot in the last
- # pathname component; the root is everything before that.
- # It is always true that root + ext == p.
  
  def splitext(p):
! 	root, ext = '', ''
! 	for c in p:
! 		if c == ':':
! 			root, ext = root + ext + c, ''
! 		elif c == '.':
! 			if ext:
! 				root, ext = root + ext, c
! 			else:
! 				ext = c
! 		elif ext:
! 			ext = ext + c
! 		else:
! 			root = root + c
! 	return root, ext
! 
! 
! # Split a pathname into a drive specification and the rest of the
! # path.  Useful on DOS/Windows/NT; on the Mac, the drive is always
! # empty (don't use the volume name -- it doesn't have the same
! # syntactic and semantic oddities as DOS drive letters, such as there
! # being a separate current directory per drive).
  
  def splitdrive(p):
! 	return '', p
  
  
--- 11,85 ----
  
  
  def isabs(s):
!     """Return true if a path is absolute.
!     On the Mac, relative paths begin with a colon,
!     but as a special case, paths with no colons at all are also relative.
!     Anything else is absolute (the string up to the first colon is the
!     volume name)."""
! 
!     return ':' in s and s[0] <> ':'
  
  
  def join(s, *p):
!     path = s
!     for t in p:
!         if (not s) or isabs(t):
!             path = t
!             continue
!         if t[:1] == ':':
!             t = t[1:]
!         if ':' not in path:
!             path = ':' + path
!         if path[-1:] <> ':':
!             path = path + ':'
!         path = path + t
!     return path
  
  
+ def split(s):
+     """Split a pathname into two parts: the directory leading up to the final
+     bit, and the basename (the filename, without colons, in that directory).
+     The result (s, t) is such that join(s, t) yields the original argument."""
+ 
+     if ':' not in s: return '', s
+     colon = 0
+     for i in range(len(s)):
+         if s[i] == ':': colon = i+1
+     path, file = s[:colon-1], s[colon:]
+     if path and not ':' in path:
+         path = path + ':'
+     return path, file
  
  
  def splitext(p):
!     """Split a path into root and extension.
!     The extension is everything starting at the last dot in the last
!     pathname component; the root is everything before that.
!     It is always true that root + ext == p."""
! 
!     root, ext = '', ''
!     for c in p:
!         if c == ':':
!             root, ext = root + ext + c, ''
!         elif c == '.':
!             if ext:
!                 root, ext = root + ext, c
!             else:
!                 ext = c
!         elif ext:
!             ext = ext + c
!         else:
!             root = root + c
!     return root, ext
  
+ 
  def splitdrive(p):
!     """Split a pathname into a drive specification and the rest of the
!     path.  Useful on DOS/Windows/NT; on the Mac, the drive is always
!     empty (don't use the volume name -- it doesn't have the same
!     syntactic and semantic oddities as DOS drive letters, such as there
!     being a separate current directory per drive)."""
! 
!     return '', p
  
  
***************
*** 90,101 ****
  
  
- # Return true if the pathname refers to an existing directory.
- 
  def isdir(s):
! 	try:
! 		st = os.stat(s)
! 	except os.error:
! 		return 0
! 	return S_ISDIR(st[ST_MODE])
  
  
--- 90,101 ----
  
  
  def isdir(s):
!     """Return true if the pathname refers to an existing directory."""
! 
!     try:
!         st = os.stat(s)
!     except os.error:
!         return 0
!     return S_ISDIR(st[ST_MODE])
  
  
***************
*** 118,220 ****
  
  
- # Return true if the pathname refers to a symbolic link.
- # (Always false on the Mac, until we understand Aliases.)
- 
  def islink(s):
! 	return 0
  
  
- # Return true if the pathname refers to an existing regular file.
  
  def isfile(s):
! 	try:
! 		st = os.stat(s)
! 	except os.error:
! 		return 0
! 	return S_ISREG(st[ST_MODE])
  
  
- # Return true if the pathname refers to an existing file or directory.
  
  def exists(s):
! 	try:
! 		st = os.stat(s)
! 	except os.error:
! 		return 0
! 	return 1
! 
! #
! # dummy expandvars to retain interface-compatability with other
! # operating systems.
  def expandvars(path):
! 	return path
  
- #
- # dummy expanduser to retain interface-compatability with other
- # operating systems.
- def expanduser(path):
- 	return path
  
! # Normalize a pathname: get rid of '::' sequences by backing up,
! # e.g., 'foo:bar::bletch' becomes 'foo:bletch'.
! # Raise the exception norm_error below if backing up is impossible,
! # e.g., for '::foo'.
! # XXX The Unix version doesn't raise an exception but simply
! # returns an unnormalized path.  Should do so here too.
  
  norm_error = 'macpath.norm_error: path cannot be normalized'
  
  def normpath(s):
! 	import string
! 	if ':' not in s:
! 		return ':' + s
! 	f = string.splitfields(s, ':')
! 	pre = []
! 	post = []
! 	if not f[0]:
! 		pre = f[:1]
! 		f = f[1:]
! 	if not f[len(f)-1]:
! 		post = f[-1:]
! 		f = f[:-1]
! 	res = []
! 	for seg in f:
! 		if seg:
! 			res.append(seg)
! 		else:
! 			if not res: raise norm_error, 'path starts with ::'
! 			del res[len(res)-1]
! 			if not (pre or res):
! 				raise norm_error, 'path starts with volume::'
! 	if pre: res = pre + res
! 	if post: res = res + post
! 	s = res[0]
! 	for seg in res[1:]:
! 		s = s + ':' + seg
! 	return s
! 
! 
! # Directory tree walk.
! # For each directory under top (including top itself),
! # func(arg, dirname, filenames) is called, where
! # dirname is the name of the directory and filenames is the list
! # of files (and subdirectories etc.) in the directory.
! # The func may modify the filenames list, to implement a filter,
! # or to impose a different order of visiting.
  
  def walk(top, func, arg):
! 	try:
! 		names = os.listdir(top)
! 	except os.error:
! 		return
! 	func(arg, top, names)
! 	for name in names:
! 		name = join(top, name)
! 		if isdir(name):
! 			walk(name, func, arg)
  
  
- # Return an absolute path.
  def abspath(path):
      if not isabs(path):
          path = join(os.getcwd(), path)
--- 118,218 ----
  
  
  def islink(s):
!     """Return true if the pathname refers to a symbolic link.
!     Always false on the Mac, until we understand Aliases.)"""
  
+     return 0
  
  
  def isfile(s):
!     """Return true if the pathname refers to an existing regular file."""
  
+     try:
+         st = os.stat(s)
+     except os.error:
+         return 0
+     return S_ISREG(st[ST_MODE])
  
  
  def exists(s):
!     """Return true if the pathname refers to an existing file or directory."""
! 
!     try:
!         st = os.stat(s)
!     except os.error:
!         return 0
!     return 1
! 
! 
  def expandvars(path):
!     """Dummy to retain interface-compatibility with other operating systems."""
!     return path
  
  
! def expanduser(path):
!     """Dummy to retain interface-compatibility with other operating systems."""
!     return path
  
  norm_error = 'macpath.norm_error: path cannot be normalized'
  
  def normpath(s):
!     """Normalize a pathname: get rid of '::' sequences by backing up,
!     e.g., 'foo:bar::bletch' becomes 'foo:bletch'.
!     Raise the exception norm_error below if backing up is impossible,
!     e.g., for '::foo'."""
!     # XXX The Unix version doesn't raise an exception but simply
!     # returns an unnormalized path.  Should do so here too.
! 
!     import string
!     if ':' not in s:
!         return ':' + s
!     f = string.splitfields(s, ':')
!     pre = []
!     post = []
!     if not f[0]:
!         pre = f[:1]
!         f = f[1:]
!     if not f[len(f)-1]:
!         post = f[-1:]
!         f = f[:-1]
!     res = []
!     for seg in f:
!         if seg:
!             res.append(seg)
!         else:
!             if not res: raise norm_error, 'path starts with ::'
!             del res[len(res)-1]
!             if not (pre or res):
!                 raise norm_error, 'path starts with volume::'
!     if pre: res = pre + res
!     if post: res = res + post
!     s = res[0]
!     for seg in res[1:]:
!         s = s + ':' + seg
!     return s
! 
  
  def walk(top, func, arg):
!     """Directory tree walk.
!     For each directory under top (including top itself),
!     func(arg, dirname, filenames) is called, where
!     dirname is the name of the directory and filenames is the list
!     of files (and subdirectories etc.) in the directory.
!     The func may modify the filenames list, to implement a filter,
!     or to impose a different order of visiting."""
! 
!     try:
!         names = os.listdir(top)
!     except os.error:
!         return
!     func(arg, top, names)
!     for name in names:
!         name = join(top, name)
!         if isdir(name):
!             walk(name, func, arg)
  
  
  def abspath(path):
+     """Return an absolute path."""
      if not isabs(path):
          path = join(os.getcwd(), path)

Index: mailcap.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mailcap.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** mailcap.py	1998/03/26 21:12:26	1.4
--- mailcap.py	2000/02/04 15:10:33	1.5
***************
*** 10,15 ****
      """Return a dictionary containing the mailcap database.
      
!     The dictionary maps a MIME type (in all lowercase,
!     e.g. 'text/plain') to a list of corresponding mailcap entries.
  
      """
--- 10,18 ----
      """Return a dictionary containing the mailcap database.
      
!     The dictionary maps a MIME type (in all lowercase, e.g. 'text/plain')
!     to a list of dictionaries corresponding to mailcap entries.  The list
!     collects all the entries for that MIME type from all available mailcap
!     files.  Each dictionary contains key-value pairs for that MIME type,
!     where the viewing command is stored with the key "view".
  
      """
***************
*** 49,52 ****
--- 52,63 ----
  
  def readmailcapfile(fp):
+     """Read a mailcap file and return a dictionary keyed by MIME type.
+ 
+     Each MIME type is mapped to an entry consisting of a list of
+     dictionaries; the list will contain more than one such dictionary
+     if a given MIME type appears more than once in the mailcap file.
+     Each dictionary contains key-value pairs for that MIME type, where
+     the viewing command is stored with the key "view".
+     """
      caps = {}
      while 1:
***************
*** 79,82 ****
--- 90,98 ----
  
  def parseline(line):
+     """Parse one entry in a mailcap file and return a dictionary.
+ 
+     The viewing command is stored as the value with the key "view",
+     and the rest of the fields produce key-value pairs in the dict.
+     """
      fields = []
      i, n = 0, len(line)
***************
*** 105,108 ****
--- 121,125 ----
  
  def parsefield(line, i, n):
+     """Separate one key-value pair in a mailcap entry."""
      start = i
      while i < n:

Index: mhlib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mhlib.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** mhlib.py	1999/02/24 16:25:17	1.18
--- mhlib.py	2000/02/04 15:10:33	1.19
***************
*** 1,56 ****
! # MH interface -- purely object-oriented (well, almost)
! #
! # Executive summary:
! #
! # import mhlib
! #
! # mh = mhlib.MH()         # use default mailbox directory and profile
! # mh = mhlib.MH(mailbox)  # override mailbox location (default from profile)
! # mh = mhlib.MH(mailbox, profile) # override mailbox and profile
! #
! # mh.error(format, ...)   # print error message -- can be overridden
! # s = mh.getprofile(key)  # profile entry (None if not set)
! # path = mh.getpath()     # mailbox pathname
! # name = mh.getcontext()  # name of current folder
! # mh.setcontext(name)     # set name of current folder
! #
! # list = mh.listfolders() # names of top-level folders
! # list = mh.listallfolders() # names of all folders, including subfolders
! # list = mh.listsubfolders(name) # direct subfolders of given folder
! # list = mh.listallsubfolders(name) # all subfolders of given folder
! #
! # mh.makefolder(name)     # create new folder
! # mh.deletefolder(name)   # delete folder -- must have no subfolders
! #
! # f = mh.openfolder(name) # new open folder object
! #
! # f.error(format, ...)    # same as mh.error(format, ...)
! # path = f.getfullname()  # folder's full pathname
! # path = f.getsequencesfilename() # full pathname of folder's sequences file
! # path = f.getmessagefilename(n)  # full pathname of message n in folder
! #
! # list = f.listmessages() # list of messages in folder (as numbers)
! # n = f.getcurrent()      # get current message
! # f.setcurrent(n)         # set current message
! # list = f.parsesequence(seq)     # parse msgs syntax into list of messages
! # n = f.getlast()         # get last message (0 if no messagse)
! # f.setlast(n)            # set last message (internal use only)
! #
! # dict = f.getsequences() # dictionary of sequences in folder {name: list}
! # f.putsequences(dict)    # write sequences back to folder
! #
! # f.createmessage(n, fp)  # add message from file f as number n
! # f.removemessages(list)  # remove messages in list from folder
! # f.refilemessages(list, tofolder) # move messages in list to other folder
! # f.movemessage(n, tofolder, ton)  # move one message to a given destination
! # f.copymessage(n, tofolder, ton)  # copy one message to a given destination
! #
! # m = f.openmessage(n)    # new open message object (costs a file descriptor)
! # m is a derived class of mimetools.Message(rfc822.Message), with:
! # s = m.getheadertext()   # text of message's headers
! # s = m.getheadertext(pred) # text of message's headers, filtered by pred
! # s = m.getbodytext()     # text of message's body, decoded
! # s = m.getbodytext(0)    # text of message's body, not decoded
! #
  # XXX To do, functionality:
  # - annotate messages
--- 1,57 ----
! """MH interface -- purely object-oriented (well, almost)
! 
! Executive summary:
! 
! import mhlib
! 
! mh = mhlib.MH()         # use default mailbox directory and profile
! mh = mhlib.MH(mailbox)  # override mailbox location (default from profile)
! mh = mhlib.MH(mailbox, profile) # override mailbox and profile
! 
! mh.error(format, ...)   # print error message -- can be overridden
! s = mh.getprofile(key)  # profile entry (None if not set)
! path = mh.getpath()     # mailbox pathname
! name = mh.getcontext()  # name of current folder
! mh.setcontext(name)     # set name of current folder
! 
! list = mh.listfolders() # names of top-level folders
! list = mh.listallfolders() # names of all folders, including subfolders
! list = mh.listsubfolders(name) # direct subfolders of given folder
! list = mh.listallsubfolders(name) # all subfolders of given folder
! 
! mh.makefolder(name)     # create new folder
! mh.deletefolder(name)   # delete folder -- must have no subfolders
! 
! f = mh.openfolder(name) # new open folder object
! 
! f.error(format, ...)    # same as mh.error(format, ...)
! path = f.getfullname()  # folder's full pathname
! path = f.getsequencesfilename() # full pathname of folder's sequences file
! path = f.getmessagefilename(n)  # full pathname of message n in folder
! 
! list = f.listmessages() # list of messages in folder (as numbers)
! n = f.getcurrent()      # get current message
! f.setcurrent(n)         # set current message
! list = f.parsesequence(seq)     # parse msgs syntax into list of messages
! n = f.getlast()         # get last message (0 if no messagse)
! f.setlast(n)            # set last message (internal use only)
! 
! dict = f.getsequences() # dictionary of sequences in folder {name: list}
! f.putsequences(dict)    # write sequences back to folder
! 
! f.createmessage(n, fp)  # add message from file f as number n
! f.removemessages(list)  # remove messages in list from folder
! f.refilemessages(list, tofolder) # move messages in list to other folder
! f.movemessage(n, tofolder, ton)  # move one message to a given destination
! f.copymessage(n, tofolder, ton)  # copy one message to a given destination
! 
! m = f.openmessage(n)    # new open message object (costs a file descriptor)
! m is a derived class of mimetools.Message(rfc822.Message), with:
! s = m.getheadertext()   # text of message's headers
! s = m.getheadertext(pred) # text of message's headers, filtered by pred
! s = m.getbodytext()     # text of message's body, decoded
! s = m.getbodytext(0)    # text of message's body, not decoded
! """
! 
  # XXX To do, functionality:
  # - annotate messages
***************
*** 88,101 ****
  
  
- # Class representing a particular collection of folders.
- # Optional constructor arguments are the pathname for the directory
- # containing the collection, and the MH profile to use.
- # If either is omitted or empty a default is used; the default
- # directory is taken from the MH profile if it is specified there.
- 
  class MH:
  
-     # Constructor
      def __init__(self, path = None, profile = None):
          if not profile: profile = MH_PROFILE
          self.profile = os.path.expanduser(profile)
--- 89,101 ----
  
  
  class MH:
+     """Class representing a particular collection of folders.
+     Optional constructor arguments are the pathname for the directory
+     containing the collection, and the MH profile to use.
+     If either is omitted or empty a default is used; the default
+     directory is taken from the MH profile if it is specified there."""
  
      def __init__(self, path = None, profile = None):
+         """Constructor."""
          if not profile: profile = MH_PROFILE
          self.profile = os.path.expanduser(profile)
***************
*** 108,129 ****
          self.path = path
  
-     # String representation
      def __repr__(self):
          return 'MH(%s, %s)' % (`self.path`, `self.profile`)
  
-     # Routine to print an error.  May be overridden by a derived class
      def error(self, msg, *args):
          sys.stderr.write('MH error: %s\n' % (msg % args))
  
-     # Return a profile entry, None if not found
      def getprofile(self, key):
          return pickline(self.profile, key)
  
-     # Return the path (the name of the collection's directory)
      def getpath(self):
          return self.path
  
-     # Return the name of the current folder
      def getcontext(self):
          context = pickline(os.path.join(self.getpath(), 'context'),
                    'Current-Folder')
--- 108,129 ----
          self.path = path
  
      def __repr__(self):
+         """String representation."""
          return 'MH(%s, %s)' % (`self.path`, `self.profile`)
  
      def error(self, msg, *args):
+         """Routine to print an error.  May be overridden by a derived class."""
          sys.stderr.write('MH error: %s\n' % (msg % args))
  
      def getprofile(self, key):
+         """Return a profile entry, None if not found."""
          return pickline(self.profile, key)
  
      def getpath(self):
+         """Return the path (the name of the collection's directory)."""
          return self.path
  
      def getcontext(self):
+         """Return the name of the current folder."""
          context = pickline(os.path.join(self.getpath(), 'context'),
                    'Current-Folder')
***************
*** 131,136 ****
          return context
  
-     # Set the name of the current folder
      def setcontext(self, context):
          fn = os.path.join(self.getpath(), 'context')
          f = open(fn, "w")
--- 131,136 ----
          return context
  
      def setcontext(self, context):
+         """Set the name of the current folder."""
          fn = os.path.join(self.getpath(), 'context')
          f = open(fn, "w")
***************
*** 138,143 ****
          f.close()
  
-     # Return the names of the top-level folders
      def listfolders(self):
          folders = []
          path = self.getpath()
--- 138,143 ----
          f.close()
  
      def listfolders(self):
+         """Return the names of the top-level folders."""
          folders = []
          path = self.getpath()
***************
*** 149,155 ****
          return folders
  
-     # Return the names of the subfolders in a given folder
-     # (prefixed with the given folder name)
      def listsubfolders(self, name):
          fullname = os.path.join(self.path, name)
          # Get the link count so we can avoid listing folders
--- 149,155 ----
          return folders
  
      def listsubfolders(self, name):
+         """Return the names of the subfolders in a given folder
+         (prefixed with the given folder name)."""
          fullname = os.path.join(self.path, name)
          # Get the link count so we can avoid listing folders
***************
*** 174,183 ****
          return subfolders
  
-     # Return the names of all folders, including subfolders, recursively
      def listallfolders(self):
          return self.listallsubfolders('')
  
-     # Return the names of subfolders in a given folder, recursively
      def listallsubfolders(self, name):
          fullname = os.path.join(self.path, name)
          # Get the link count so we can avoid listing folders
--- 174,183 ----
          return subfolders
  
      def listallfolders(self):
+         """Return the names of all folders and subfolders, recursively."""
          return self.listallsubfolders('')
  
      def listallsubfolders(self, name):
+         """Return the names of subfolders in a given folder, recursively."""
          fullname = os.path.join(self.path, name)
          # Get the link count so we can avoid listing folders
***************
*** 207,217 ****
          return subfolders
  
-     # Return a new Folder object for the named folder
      def openfolder(self, name):
          return Folder(self, name)
  
-     # Create a new folder.  This raises os.error if the folder
-     # cannot be created
      def makefolder(self, name):
          protect = pickline(self.profile, 'Folder-Protect')
          if protect and isnumeric(protect):
--- 207,216 ----
          return subfolders
  
      def openfolder(self, name):
+         """Return a new Folder object for the named folder."""
          return Folder(self, name)
  
      def makefolder(self, name):
+         """Create a new folder (or raise os.error if it cannot be created)."""
          protect = pickline(self.profile, 'Folder-Protect')
          if protect and isnumeric(protect):
***************
*** 221,228 ****
          os.mkdir(os.path.join(self.getpath(), name), mode)
  
-     # Delete a folder.  This removes files in the folder but not
-     # subdirectories.  If deleting the folder itself fails it
-     # raises os.error
      def deletefolder(self, name):
          fullname = os.path.join(self.getpath(), name)
          for subname in os.listdir(fullname):
--- 220,226 ----
          os.mkdir(os.path.join(self.getpath(), name), mode)
  
      def deletefolder(self, name):
+         """Delete a folder.  This removes files in the folder but not
+         subdirectories.  Raise os.error if deleting the folder itself fails."""
          fullname = os.path.join(self.getpath(), name)
          for subname in os.listdir(fullname):
***************
*** 236,241 ****
  
  
- # Class representing a particular folder
- 
  numericprog = re.compile('^[1-9][0-9]*$')
  def isnumeric(str):
--- 234,237 ----
***************
*** 243,249 ****
  
  class Folder:
  
-     # Constructor
      def __init__(self, mh, name):
          self.mh = mh
          self.name = name
--- 239,246 ----
  
  class Folder:
+     """Class representing a particular folder."""
  
      def __init__(self, mh, name):
+         """Constructor."""
          self.mh = mh
          self.name = name
***************
*** 251,285 ****
              raise Error, 'no folder %s' % name
  
-     # String representation
      def __repr__(self):
          return 'Folder(%s, %s)' % (`self.mh`, `self.name`)
  
-     # Error message handler
      def error(self, *args):
          apply(self.mh.error, args)
  
-     # Return the full pathname of the folder
      def getfullname(self):
          return os.path.join(self.mh.path, self.name)
  
-     # Return the full pathname of the folder's sequences file
      def getsequencesfilename(self):
          return os.path.join(self.getfullname(), MH_SEQUENCES)
  
-     # Return the full pathname of a message in the folder
      def getmessagefilename(self, n):
          return os.path.join(self.getfullname(), str(n))
  
-     # Return list of direct subfolders
      def listsubfolders(self):
          return self.mh.listsubfolders(self.name)
  
-     # Return list of all subfolders
      def listallsubfolders(self):
          return self.mh.listallsubfolders(self.name)
  
-     # Return the list of messages currently present in the folder.
-     # As a side effect, set self.last to the last message (or 0)
      def listmessages(self):
          messages = []
          match = numericprog.match
--- 248,282 ----
              raise Error, 'no folder %s' % name
  
      def __repr__(self):
+         """String representation."""
          return 'Folder(%s, %s)' % (`self.mh`, `self.name`)
  
      def error(self, *args):
+         """Error message handler."""
          apply(self.mh.error, args)
  
      def getfullname(self):
+         """Return the full pathname of the folder."""
          return os.path.join(self.mh.path, self.name)
  
      def getsequencesfilename(self):
+         """Return the full pathname of the folder's sequences file."""
          return os.path.join(self.getfullname(), MH_SEQUENCES)
  
      def getmessagefilename(self, n):
+         """Return the full pathname of a message in the folder."""
          return os.path.join(self.getfullname(), str(n))
  
      def listsubfolders(self):
+         """Return list of direct subfolders."""
          return self.mh.listsubfolders(self.name)
  
      def listallsubfolders(self):
+         """Return list of all subfolders."""
          return self.mh.listallsubfolders(self.name)
  
      def listmessages(self):
+         """Return the list of messages currently present in the folder.
+         As a side effect, set self.last to the last message (or 0)."""
          messages = []
          match = numericprog.match
***************
*** 296,301 ****
          return messages
  
-     # Return the set of sequences for the folder
      def getsequences(self):
          sequences = {}
          fullname = self.getsequencesfilename()
--- 293,298 ----
          return messages
  
      def getsequences(self):
+         """Return the set of sequences for the folder."""
          sequences = {}
          fullname = self.getsequencesfilename()
***************
*** 316,321 ****
          return sequences
  
-     # Write the set of sequences back to the folder
      def putsequences(self, sequences):
          fullname = self.getsequencesfilename()
          f = None
--- 313,318 ----
          return sequences
  
      def putsequences(self, sequences):
+         """Write the set of sequences back to the folder."""
          fullname = self.getsequencesfilename()
          f = None
***************
*** 333,338 ****
              f.close()
  
-     # Return the current message.  Raise KeyError when there is none
      def getcurrent(self):
          seqs = self.getsequences()
          try:
--- 330,335 ----
              f.close()
  
      def getcurrent(self):
+         """Return the current message.  Raise KeyError when there is none."""
          seqs = self.getsequences()
          try:
***************
*** 341,353 ****
              raise Error, "no cur message"
  
-     # Set the current message
      def setcurrent(self, n):
          updateline(self.getsequencesfilename(), 'cur', str(n), 0)
  
-     # Parse an MH sequence specification into a message list.
-     # Attempt to mimic mh-sequence(5) as close as possible.
-     # Also attempt to mimic observed behavior regarding which
-     # conditions cause which error messages
      def parsesequence(self, seq):
          # XXX Still not complete (see mh-format(5)).
          # Missing are:
--- 338,350 ----
              raise Error, "no cur message"
  
      def setcurrent(self, n):
+         """Set the current message."""
          updateline(self.getsequencesfilename(), 'cur', str(n), 0)
  
      def parsesequence(self, seq):
+         """Parse an MH sequence specification into a message list.
+         Attempt to mimic mh-sequence(5) as close as possible.
+         Also attempt to mimic observed behavior regarding which
+         conditions cause which error messages."""
          # XXX Still not complete (see mh-format(5)).
          # Missing are:
***************
*** 429,434 ****
                  return [n]
  
-     # Internal: parse a message number (or cur, first, etc.)
      def _parseindex(self, seq, all):
          if isnumeric(seq):
              try:
--- 426,431 ----
                  return [n]
  
      def _parseindex(self, seq, all):
+         """Internal: parse a message number (or cur, first, etc.)."""
          if isnumeric(seq):
              try:
***************
*** 460,469 ****
          raise Error, None
  
-     # Open a message -- returns a Message object
      def openmessage(self, n):
          return Message(self, n)
  
-     # Remove one or more messages -- may raise os.error
      def removemessages(self, list):
          errors = []
          deleted = []
--- 457,466 ----
          raise Error, None
  
      def openmessage(self, n):
+         """Open a message -- returns a Message object."""
          return Message(self, n)
  
      def removemessages(self, list):
+         """Remove one or more messages -- may raise os.error."""
          errors = []
          deleted = []
***************
*** 489,495 ****
                  raise os.error, ('multiple errors:', errors)
  
-     # Refile one or more messages -- may raise os.error.
-     # 'tofolder' is an open folder object
      def refilemessages(self, list, tofolder, keepsequences=0):
          errors = []
          refiled = {}
--- 486,492 ----
                  raise os.error, ('multiple errors:', errors)
  
      def refilemessages(self, list, tofolder, keepsequences=0):
+         """Refile one or more messages -- may raise os.error.
+         'tofolder' is an open folder object."""
          errors = []
          refiled = {}
***************
*** 524,529 ****
                  raise os.error, ('multiple errors:', errors)
  
-     # Helper for refilemessages() to copy sequences
      def _copysequences(self, fromfolder, refileditems):
          fromsequences = fromfolder.getsequences()
          tosequences = self.getsequences()
--- 521,526 ----
                  raise os.error, ('multiple errors:', errors)
  
      def _copysequences(self, fromfolder, refileditems):
+         """Helper for refilemessages() to copy sequences."""
          fromsequences = fromfolder.getsequences()
          tosequences = self.getsequences()
***************
*** 545,551 ****
              self.putsequences(tosequences)
  
-     # Move one message over a specific destination message,
-     # which may or may not already exist.
      def movemessage(self, n, tofolder, ton):
          path = self.getmessagefilename(n)
          # Open it to check that it exists
--- 542,548 ----
              self.putsequences(tosequences)
  
      def movemessage(self, n, tofolder, ton):
+         """Move one message over a specific destination message,
+         which may or may not already exist."""
          path = self.getmessagefilename(n)
          # Open it to check that it exists
***************
*** 577,583 ****
          self.removefromallsequences([n])
  
-     # Copy one message over a specific destination message,
-     # which may or may not already exist.
      def copymessage(self, n, tofolder, ton):
          path = self.getmessagefilename(n)
          # Open it to check that it exists
--- 574,580 ----
          self.removefromallsequences([n])
  
      def copymessage(self, n, tofolder, ton):
+         """Copy one message over a specific destination message,
+         which may or may not already exist."""
          path = self.getmessagefilename(n)
          # Open it to check that it exists
***************
*** 603,608 ****
                      pass
  
-     # Create a message, with text from the open file txt.
      def createmessage(self, n, txt):
          path = self.getmessagefilename(n)
          backuppath = self.getmessagefilename(',%d' % n)
--- 600,605 ----
                      pass
  
      def createmessage(self, n, txt):
+         """Create a message, with text from the open file txt."""
          path = self.getmessagefilename(n)
          backuppath = self.getmessagefilename(',%d' % n)
***************
*** 629,635 ****
                      pass
  
-     # Remove one or more messages from all sequeuces (including last)
-     # -- but not from 'cur'!!!
      def removefromallsequences(self, list):
          if hasattr(self, 'last') and self.last in list:
              del self.last
--- 626,632 ----
                      pass
  
      def removefromallsequences(self, list):
+         """Remove one or more messages from all sequeuces (including last)
+         -- but not from 'cur'!!!"""
          if hasattr(self, 'last') and self.last in list:
              del self.last
***************
*** 648,659 ****
              self.putsequences(sequences)
  
-     # Return the last message number
      def getlast(self):
          if not hasattr(self, 'last'):
              messages = self.listmessages()
          return self.last
  
-     # Set the last message number
      def setlast(self, last):
          if last is None:
              if hasattr(self, 'last'):
--- 645,656 ----
              self.putsequences(sequences)
  
      def getlast(self):
+         """Return the last message number."""
          if not hasattr(self, 'last'):
              messages = self.listmessages()
          return self.last
  
      def setlast(self, last):
+         """Set the last message number."""
          if last is None:
              if hasattr(self, 'last'):
***************
*** 664,669 ****
  class Message(mimetools.Message):
  
-     # Constructor
      def __init__(self, f, n, fp = None):
          self.folder = f
          self.number = n
--- 661,666 ----
  class Message(mimetools.Message):
  
      def __init__(self, f, n, fp = None):
+         """Constructor."""
          self.folder = f
          self.number = n
***************
*** 673,685 ****
          mimetools.Message.__init__(self, fp)
  
-     # String representation
      def __repr__(self):
          return 'Message(%s, %s)' % (repr(self.folder), self.number)
  
-     # Return the message's header text as a string.  If an
-     # argument is specified, it is used as a filter predicate to
-     # decide which headers to return (its argument is the header
-     # name converted to lower case).
      def getheadertext(self, pred = None):
          if not pred:
              return string.joinfields(self.headers, '')
--- 670,682 ----
          mimetools.Message.__init__(self, fp)
  
      def __repr__(self):
+         """String representation."""
          return 'Message(%s, %s)' % (repr(self.folder), self.number)
  
      def getheadertext(self, pred = None):
+         """Return the message's header text as a string.  If an
+         argument is specified, it is used as a filter predicate to
+         decide which headers to return (its argument is the header
+         name converted to lower case)."""
          if not pred:
              return string.joinfields(self.headers, '')
***************
*** 694,702 ****
          return string.joinfields(headers, '')
  
-     # Return the message's body text as string.  This undoes a
-     # Content-Transfer-Encoding, but does not interpret other MIME
-     # features (e.g. multipart messages).  To suppress to
-     # decoding, pass a 0 as argument
      def getbodytext(self, decode = 1):
          self.fp.seek(self.startofbody)
          encoding = self.getencoding()
--- 691,699 ----
          return string.joinfields(headers, '')
  
      def getbodytext(self, decode = 1):
+         """Return the message's body text as string.  This undoes a
+         Content-Transfer-Encoding, but does not interpret other MIME
+         features (e.g. multipart messages).  To suppress decoding,
+         pass 0 as an argument."""
          self.fp.seek(self.startofbody)
          encoding = self.getencoding()
***************
*** 708,715 ****
          return output.getvalue()
  
-     # Only for multipart messages: return the message's body as a
-     # list of SubMessage objects.  Each submessage object behaves
-     # (almost) as a Message object.
      def getbodyparts(self):
          if self.getmaintype() != 'multipart':
              raise Error, 'Content-Type is not multipart/*'
--- 705,712 ----
          return output.getvalue()
  
      def getbodyparts(self):
+         """Only for multipart messages: return the message's body as a
+         list of SubMessage objects.  Each submessage object behaves
+         (almost) as a Message object."""
          if self.getmaintype() != 'multipart':
              raise Error, 'Content-Type is not multipart/*'
***************
*** 728,733 ****
          return parts
  
-     # Return body, either a string or a list of messages
      def getbody(self):
          if self.getmaintype() == 'multipart':
              return self.getbodyparts()
--- 725,730 ----
          return parts
  
      def getbody(self):
+         """Return body, either a string or a list of messages."""
          if self.getmaintype() == 'multipart':
              return self.getbodyparts()
***************
*** 738,743 ****
  class SubMessage(Message):
  
-     # Constructor
      def __init__(self, f, n, fp):
          Message.__init__(self, f, n, fp)
          if self.getmaintype() == 'multipart':
--- 735,740 ----
  class SubMessage(Message):
  
      def __init__(self, f, n, fp):
+         """Constructor."""
          Message.__init__(self, f, n, fp)
          if self.getmaintype() == 'multipart':
***************
*** 748,753 ****
              # XXX If this is big, should remember file pointers
  
-     # String representation
      def __repr__(self):
          f, n, fp = self.folder, self.number, self.fp
          return 'SubMessage(%s, %s, %s)' % (f, n, fp)
--- 745,750 ----
              # XXX If this is big, should remember file pointers
  
      def __repr__(self):
+         """String representation."""
          f, n, fp = self.folder, self.number, self.fp
          return 'SubMessage(%s, %s, %s)' % (f, n, fp)
***************
*** 767,792 ****
  
  
- # Class implementing sets of integers.
- #
- # This is an efficient representation for sets consisting of several
- # continuous ranges, e.g. 1-100,200-400,402-1000 is represented
- # internally as a list of three pairs: [(1,100), (200,400),
- # (402,1000)].  The internal representation is always kept normalized.
- #
- # The constructor has up to three arguments:
- # - the string used to initialize the set (default ''),
- # - the separator between ranges (default ',')
- # - the separator between begin and end of a range (default '-')
- # The separators must be strings (not regexprs) and should be different.
- #
- # The tostring() function yields a string that can be passed to another
- # IntSet constructor; __repr__() is a valid IntSet constructor itself.
- #
- # XXX The default begin/end separator means that negative numbers are
- #     not supported very well.
- #
- # XXX There are currently no operations to remove set elements.
- 
  class IntSet:
  
      def __init__(self, data = None, sep = ',', rng = '-'):
--- 764,789 ----
  
  
  class IntSet:
+     """Class implementing sets of integers.
+ 
+     This is an efficient representation for sets consisting of several
+     continuous ranges, e.g. 1-100,200-400,402-1000 is represented
+     internally as a list of three pairs: [(1,100), (200,400),
+     (402,1000)].  The internal representation is always kept normalized.
+ 
+     The constructor has up to three arguments:
+     - the string used to initialize the set (default ''),
+     - the separator between ranges (default ',')
+     - the separator between begin and end of a range (default '-')
+     The separators must be strings (not regexprs) and should be different.
+ 
+     The tostring() function yields a string that can be passed to another
+     IntSet constructor; __repr__() is a valid IntSet constructor itself.
+     """
+ 
+     # XXX The default begin/end separator means that negative numbers are
+     #     not supported very well.
+     #
+     # XXX There are currently no operations to remove set elements.
  
      def __init__(self, data = None, sep = ',', rng = '-'):

Index: mimetools.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mimetools.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** mimetools.py	1998/05/20 17:05:35	1.15
--- mimetools.py	2000/02/04 15:10:33	1.16
***************
*** 1,3 ****
! # Various tools used by MIME-reading or MIME-writing programs.
  
  
--- 1,3 ----
! """Various tools used by MIME-reading or MIME-writing programs."""
  
  
***************
*** 8,15 ****
  
  
- # A derived class of rfc822.Message that knows about MIME headers and
- # contains some hooks for decoding encoded and multipart messages.
- 
  class Message(rfc822.Message):
  
  	def __init__(self, fp, seekable = 1):
--- 8,14 ----
  
  
  class Message(rfc822.Message):
+ 	"""A derived class of rfc822.Message that knows about MIME headers and
+ 	contains some hooks for decoding encoded and multipart messages."""
  
  	def __init__(self, fp, seekable = 1):
***************
*** 97,111 ****
  
  
- # Return a random string usable as a multipart boundary.
- # The method used is so that it is *very* unlikely that the same
- # string of characters will every occur again in the Universe,
- # so the caller needn't check the data it is packing for the
- # occurrence of the boundary.
- #
- # The boundary contains dots so you have to quote it in the header.
- 
  _prefix = None
  
  def choose_boundary():
  	global _prefix
  	import time
--- 96,110 ----
  
  
  _prefix = None
  
  def choose_boundary():
+ 	"""Return a random string usable as a multipart boundary.
+ 	The method used is so that it is *very* unlikely that the same
+ 	string of characters will every occur again in the Universe,
+ 	so the caller needn't check the data it is packing for the
+ 	occurrence of the boundary.
+ 
+ 	The boundary contains dots so you have to quote it in the header."""
+ 
  	global _prefix
  	import time
***************
*** 132,135 ****
--- 131,135 ----
  
  def decode(input, output, encoding):
+ 	"""Decode common content-transfer-encodings (base64, quopri, uuencode)."""
  	if encoding == 'base64':
  		import base64
***************
*** 148,151 ****
--- 148,152 ----
  
  def encode(input, output, encoding):
+ 	"""Encode common content-transfer-encodings (base64, quopri, uuencode)."""
  	if encoding == 'base64':
  		import base64

Index: mimify.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mimify.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** mimify.py	1998/08/07 15:26:56	1.13
--- mimify.py	2000/02/04 15:10:33	1.14
***************
*** 3,7 ****
  '''Mimification and unmimification of mail messages.
  
! decode quoted-printable parts of a mail message or encode using
  quoted-printable.
  
--- 3,7 ----
  '''Mimification and unmimification of mail messages.
  
! Decode quoted-printable parts of a mail message or encode using
  quoted-printable.
  
***************
*** 40,46 ****
  
  class File:
! 	'''A simple fake file object that knows about limited
! 	   read-ahead and boundaries.
! 	   The only supported method is readline().'''
  
  	def __init__(self, file, boundary):
--- 40,45 ----
  
  class File:
! 	"""A simple fake file object that knows about limited read-ahead and
! 	boundaries.  The only supported method is readline()."""
  
  	def __init__(self, file, boundary):
***************
*** 88,92 ****
  
  def mime_decode(line):
! 	'''Decode a single line of quoted-printable text to 8bit.'''
  	newline = ''
  	pos = 0
--- 87,91 ----
  
  def mime_decode(line):
! 	"""Decode a single line of quoted-printable text to 8bit."""
  	newline = ''
  	pos = 0
***************
*** 101,105 ****
  
  def mime_decode_header(line):
! 	'''Decode a header line to 8bit.'''
  	newline = ''
  	pos = 0
--- 100,104 ----
  
  def mime_decode_header(line):
! 	"""Decode a header line to 8bit."""
  	newline = ''
  	pos = 0
***************
*** 116,120 ****
  
  def unmimify_part(ifile, ofile, decode_base64 = 0):
! 	'''Convert a quoted-printable part of a MIME mail message to 8bit.'''
  	multipart = None
  	quoted_printable = 0
--- 115,119 ----
  
  def unmimify_part(ifile, ofile, decode_base64 = 0):
! 	"""Convert a quoted-printable part of a MIME mail message to 8bit."""
  	multipart = None
  	quoted_printable = 0
***************
*** 201,205 ****
  
  def unmimify(infile, outfile, decode_base64 = 0):
! 	'''Convert quoted-printable parts of a MIME mail message to 8bit.'''
  	if type(infile) == type(''):
  		ifile = open(infile)
--- 200,204 ----
  
  def unmimify(infile, outfile, decode_base64 = 0):
! 	"""Convert quoted-printable parts of a MIME mail message to 8bit."""
  	if type(infile) == type(''):
  		ifile = open(infile)
***************
*** 222,227 ****
  
  def mime_encode(line, header):
! 	'''Code a single line as quoted-printable.
! 	   If header is set, quote some extra characters.'''
  	if header:
  		reg = mime_header_char
--- 221,226 ----
  
  def mime_encode(line, header):
! 	"""Code a single line as quoted-printable.
! 	If header is set, quote some extra characters."""
  	if header:
  		reg = mime_header_char
***************
*** 256,260 ****
  
  def mime_encode_header(line):
! 	'''Code a single header line as quoted-printable.'''
  	newline = ''
  	pos = 0
--- 255,259 ----
  
  def mime_encode_header(line):
! 	"""Code a single header line as quoted-printable."""
  	newline = ''
  	pos = 0
***************
*** 274,278 ****
  
  def mimify_part(ifile, ofile, is_mime):
! 	'''Convert an 8bit part of a MIME mail message to quoted-printable.'''
  	has_cte = is_qp = is_base64 = 0
  	multipart = None
--- 273,277 ----
  
  def mimify_part(ifile, ofile, is_mime):
! 	"""Convert an 8bit part of a MIME mail message to quoted-printable."""
  	has_cte = is_qp = is_base64 = 0
  	multipart = None
***************
*** 409,413 ****
  
  def mimify(infile, outfile):
! 	'''Convert 8bit parts of a MIME mail message to quoted-printable.'''
  	if type(infile) == type(''):
  		ifile = open(infile)
--- 408,412 ----
  
  def mimify(infile, outfile):
! 	"""Convert 8bit parts of a MIME mail message to quoted-printable."""
  	if type(infile) == type(''):
  		ifile = open(infile)

Index: multifile.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/multifile.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** multifile.py	1998/06/29 17:58:43	1.8
--- multifile.py	2000/02/04 15:10:33	1.9
***************
*** 1,28 ****
! # A class that makes each part of a multipart message "feel" like an
! # ordinary file, as long as you use fp.readline().  Allows recursive
! # use, for nested multipart messages.  Probably best used together
! # with module mimetools.
! #
! # Suggested use:
! #
! # real_fp = open(...)
! # fp = MultiFile(real_fp)
! #
! # "read some lines from fp"
! # fp.push(separator)
! # while 1:
! #	"read lines from fp until it returns an empty string" (A)
! #	if not fp.next(): break
! # fp.pop()
! # "read remaining lines from fp until it returns an empty string"
! #
! # The latter sequence may be used recursively at (A).
! # It is also allowed to use multiple push()...pop() sequences.
! #
! # If seekable is given as 0, the class code will not do the bookeeping
! # it normally attempts in order to make seeks relative to the beginning of the
! # current file part.  This may be useful when using MultiFile with a non-
! # seekable stream object.
  
  import sys
  import string
--- 1,31 ----
! """A readline()-style interface to the parts of a multipart message.
  
+ The MultiFile class makes each part of a multipart message "feel" like
+ an ordinary file, as long as you use fp.readline().  Allows recursive
+ use, for nested multipart messages.  Probably best used together
+ with module mimetools.
+ 
+ Suggested use:
+ 
+ real_fp = open(...)
+ fp = MultiFile(real_fp)
+ 
+ "read some lines from fp"
+ fp.push(separator)
+ while 1:
+ 	"read lines from fp until it returns an empty string" (A)
+ 	if not fp.next(): break
+ fp.pop()
+ "read remaining lines from fp until it returns an empty string"
+ 
+ The latter sequence may be used recursively at (A).
+ It is also allowed to use multiple push()...pop() sequences.
+ 
+ If seekable is given as 0, the class code will not do the bookeeping
+ it normally attempts in order to make seeks relative to the beginning of the
+ current file part.  This may be useful when using MultiFile with a non-
+ seekable stream object.
+ """
+ 
  import sys
  import string
***************
*** 31,37 ****
  
  class MultiFile:
! 	#
  	seekable = 0
! 	#
  	def __init__(self, fp, seekable=1):
  		self.fp = fp
--- 34,40 ----
  
  class MultiFile:
! 
  	seekable = 0
! 
  	def __init__(self, fp, seekable=1):
  		self.fp = fp
***************
*** 43,52 ****
  			self.start = self.fp.tell()
  			self.posstack = [] # Grows down
! 	#
  	def tell(self):
  		if self.level > 0:
  			return self.lastpos
  		return self.fp.tell() - self.start
! 	#
  	def seek(self, pos, whence=0):
  		here = self.tell()
--- 46,55 ----
  			self.start = self.fp.tell()
  			self.posstack = [] # Grows down
! 
  	def tell(self):
  		if self.level > 0:
  			return self.lastpos
  		return self.fp.tell() - self.start
! 
  	def seek(self, pos, whence=0):
  		here = self.tell()
***************
*** 65,69 ****
  		self.level = 0
  		self.last = 0
! 	#
  	def readline(self):
  		if self.level > 0:
--- 68,72 ----
  		self.level = 0
  		self.last = 0
! 
  	def readline(self):
  		if self.level > 0:
***************
*** 106,110 ****
  			raise Error,'Missing endmarker in MultiFile.readline()'
  		return ''
! 	#
  	def readlines(self):
  		list = []
--- 109,113 ----
  			raise Error,'Missing endmarker in MultiFile.readline()'
  		return ''
! 
  	def readlines(self):
  		list = []
***************
*** 114,121 ****
  			list.append(line)
  		return list
! 	#
  	def read(self): # Note: no size argument -- read until EOF only!
  		return string.joinfields(self.readlines(), '')
! 	#
  	def next(self):
  		while self.readline(): pass
--- 117,124 ----
  			list.append(line)
  		return list
! 
  	def read(self): # Note: no size argument -- read until EOF only!
  		return string.joinfields(self.readlines(), '')
! 
  	def next(self):
  		while self.readline(): pass
***************
*** 127,131 ****
  			self.start = self.fp.tell()
  		return 1
! 	#
  	def push(self, sep):
  		if self.level > 0:
--- 130,134 ----
  			self.start = self.fp.tell()
  		return 1
! 
  	def push(self, sep):
  		if self.level > 0:
***************
*** 135,139 ****
  			self.posstack.insert(0, self.start)
  			self.start = self.fp.tell()
! 	#
  	def pop(self):
  		if self.stack == []:
--- 138,142 ----
  			self.posstack.insert(0, self.start)
  			self.start = self.fp.tell()
! 
  	def pop(self):
  		if self.stack == []:
***************
*** 150,160 ****
  			if self.level > 0:
  				self.lastpos = abslastpos - self.start
! 	#
  	def is_data(self, line):
  		return line[:2] <> '--'
! 	#
  	def section_divider(self, str):
  		return "--" + str
! 	#
  	def end_marker(self, str):
  		return "--" + str + "--"
--- 153,163 ----
  			if self.level > 0:
  				self.lastpos = abslastpos - self.start
! 
  	def is_data(self, line):
  		return line[:2] <> '--'
! 
  	def section_divider(self, str):
  		return "--" + str
! 
  	def end_marker(self, str):
  		return "--" + str + "--"

Index: mutex.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mutex.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** mutex.py	1996/10/08 14:06:17	1.5
--- mutex.py	2000/02/04 15:10:33	1.6
***************
*** 1,32 ****
! # Mutual exclusion -- for use with module sched
  
! # A mutex has two pieces of state -- a 'locked' bit and a queue.
! # When the mutex is not locked, the queue is empty.
! # Otherwise, the queue contains 0 or more (function, argument) pairs
! # representing functions (or methods) waiting to acquire the lock.
! # When the mutex is unlocked while the queue is not empty,
! # the first queue entry is removed and its function(argument) pair called,
! # implying it now has the lock.
! #
! # Of course, no multi-threading is implied -- hence the funny interface
! # for lock, where a function is called once the lock is aquired.
! #
  class mutex:
- 	#
- 	# Create a new mutex -- initially unlocked
- 	#
  	def __init__(self):
  		self.locked = 0
  		self.queue = []
! 	#
! 	# Test the locked bit of the mutex
! 	#
  	def test(self):
  		return self.locked
! 	#
! 	# Atomic test-and-set -- grab the lock if it is not set,
! 	# return true if it succeeded
! 	#
  	def testandset(self):
  		if not self.locked:
  			self.locked = 1
--- 1,29 ----
! """Mutual exclusion -- for use with module sched
  
! A mutex has two pieces of state -- a 'locked' bit and a queue.
! When the mutex is not locked, the queue is empty.
! Otherwise, the queue contains 0 or more (function, argument) pairs
! representing functions (or methods) waiting to acquire the lock.
! When the mutex is unlocked while the queue is not empty,
! the first queue entry is removed and its function(argument) pair called,
! implying it now has the lock.
! 
! Of course, no multi-threading is implied -- hence the funny interface
! for lock, where a function is called once the lock is aquired.
! """
! 
  class mutex:
  	def __init__(self):
+ 		"""Create a new mutex -- initially unlocked."""
  		self.locked = 0
  		self.queue = []
! 
  	def test(self):
+ 		"""Test the locked bit of the mutex."""
  		return self.locked
! 
  	def testandset(self):
+ 		"""Atomic test-and-set -- grab the lock if it is not set,
+ 		return true if it succeeded."""
  		if not self.locked:
  			self.locked = 1
***************
*** 34,53 ****
  		else:
  			return 0
! 	#
! 	# Lock a mutex, call the function with supplied argument
! 	# when it is acquired.
! 	# If the mutex is already locked, place function and argument
! 	# in the queue.
! 	#
  	def lock(self, function, argument):
  		if self.testandset():
  			function(argument)
  		else:
  			self.queue.append((function, argument))
! 	#
! 	# Unlock a mutex.  If the queue is not empty, call the next
! 	# function with its argument.
! 	#
  	def unlock(self):
  		if self.queue:
  			function, argument = self.queue[0]
--- 31,47 ----
  		else:
  			return 0
! 
  	def lock(self, function, argument):
+ 		"""Lock a mutex, call the function with supplied argument
+ 		when it is acquired.  If the mutex is already locked, place
+ 		function and argument in the queue."""
  		if self.testandset():
  			function(argument)
  		else:
  			self.queue.append((function, argument))
! 
  	def unlock(self):
+ 		"""Unlock a mutex.  If the queue is not empty, call the next
+ 		function with its argument."""
  		if self.queue:
  			function, argument = self.queue[0]
***************
*** 56,58 ****
  		else:
  			self.locked = 0
- 	#
--- 50,51 ----

Index: netrc.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/netrc.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** netrc.py	1999/05/03 18:10:37	1.3
--- netrc.py	2000/02/04 15:10:33	1.4
***************
*** 1,2 ****
--- 1,4 ----
+ """An object-oriented interface to .netrc files."""
+ 
  # Module and documentation by Eric S. Raymond, 21 Dec 1998 
  
***************
*** 64,68 ****
  
      def authenticators(self, host):
!         "Return a (user, account, password) tuple for given host."
          if self.hosts.has_key(host):
              return self.hosts[host]
--- 66,70 ----
  
      def authenticators(self, host):
!         """Return a (user, account, password) tuple for given host."""
          if self.hosts.has_key(host):
              return self.hosts[host]
***************
*** 73,77 ****
  
      def __repr__(self):
!         "Dump the class data in the format of a .netrc file"
          rep = ""
          for host in self.hosts.keys():
--- 75,79 ----
  
      def __repr__(self):
!         """Dump the class data in the format of a .netrc file."""
          rep = ""
          for host in self.hosts.keys():

Index: nntplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/nntplib.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** nntplib.py	1998/12/21 18:51:23	1.16
--- nntplib.py	2000/02/04 15:10:33	1.17
***************
*** 1,30 ****
! # An NNTP client class.  Based on RFC 977: Network News Transfer
! # Protocol, by Brian Kantor and Phil Lapsley.
  
  
! # Example:
! #
! # >>> from nntplib import NNTP
! # >>> s = NNTP('news')
! # >>> resp, count, first, last, name = s.group('comp.lang.python')
! # >>> print 'Group', name, 'has', count, 'articles, range', first, 'to', last
! # Group comp.lang.python has 51 articles, range 5770 to 5821
! # >>> resp, subs = s.xhdr('subject', first + '-' + last)
! # >>> resp = s.quit()
! # >>>
! #
! # Here 'resp' is the server response line.
! # Error responses are turned into exceptions.
! #
! # To post an article from a file:
! # >>> f = open(filename, 'r') # file containing article, including header
! # >>> resp = s.post(f)
! # >>>
! #
! # For descriptions of all methods, read the comments in the code below.
! # Note that all arguments and return values representing article numbers
! # are strings, not numbers, since they are rarely used for calculations.
  
! # (xover, xgtitle, xpath, date methods by Kevan Heydon)
  
  
--- 1,30 ----
! """An NNTP client class based on RFC 977: Network News Transfer Protocol.
  
+ Example:
  
! >>> from nntplib import NNTP
! >>> s = NNTP('news')
! >>> resp, count, first, last, name = s.group('comp.lang.python')
! >>> print 'Group', name, 'has', count, 'articles, range', first, 'to', last
! Group comp.lang.python has 51 articles, range 5770 to 5821
! >>> resp, subs = s.xhdr('subject', first + '-' + last)
! >>> resp = s.quit()
! >>>
! 
! Here 'resp' is the server response line.
! Error responses are turned into exceptions.
! 
! To post an article from a file:
! >>> f = open(filename, 'r') # file containing article, including header
! >>> resp = s.post(f)
! >>>
! 
! For descriptions of all methods, read the comments in the code below.
! Note that all arguments and return values representing article numbers
! are strings, not numbers, since they are rarely used for calculations.
! """
  
! # RFC 977 by Brian Kantor and Phil Lapsley.
! # xover, xgtitle, xpath, date methods by Kevan Heydon
  
  
***************
*** 36,40 ****
  
  # Exception raised when an error or invalid response is received
- 
  error_reply = 'nntplib.error_reply'	# unexpected [123]xx reply
  error_temp = 'nntplib.error_temp'	# 4xx errors
--- 36,39 ----
***************
*** 60,68 ****
  class NNTP:
  
- 	# Initialize an instance.  Arguments:
- 	# - host: hostname to connect to
- 	# - port: port to connect to (default the standard NNTP port)
- 
  	def __init__(self, host, port = NNTP_PORT, user=None, password=None):
  		self.host = host
  		self.port = port
--- 59,67 ----
  class NNTP:
  
  	def __init__(self, host, port = NNTP_PORT, user=None, password=None):
+ 		"""Initialize an instance.  Arguments:
+ 		- host: hostname to connect to
+ 		- port: port to connect to (default the standard NNTP port)"""
+ 
  		self.host = host
  		self.port = port
***************
*** 83,118 ****
  						raise error_perm, resp
  
- 	# Get the welcome message from the server
- 	# (this is read and squirreled away by __init__()).
- 	# If the response code is 200, posting is allowed;
- 	# if it 201, posting is not allowed
- 
  	def getwelcome(self):
  		if self.debugging: print '*welcome*', `self.welcome`
  		return self.welcome
  
- 	# Set the debugging level.  Argument level means:
- 	# 0: no debugging output (default)
- 	# 1: print commands and responses but not body text etc.
- 	# 2: also print raw lines read and sent before stripping CR/LF
- 
  	def set_debuglevel(self, level):
  		self.debugging = level
  	debug = set_debuglevel
  
- 	# Internal: send one line to the server, appending CRLF
  	def putline(self, line):
  		line = line + CRLF
  		if self.debugging > 1: print '*put*', `line`
  		self.sock.send(line)
  
- 	# Internal: send one command to the server (through putline())
  	def putcmd(self, line):
  		if self.debugging: print '*cmd*', `line`
  		self.putline(line)
  
- 	# Internal: return one line from the server, stripping CRLF.
- 	# Raise EOFError if the connection is closed
  	def getline(self):
  		line = self.file.readline()
  		if self.debugging > 1:
--- 82,117 ----
  						raise error_perm, resp
  
  	def getwelcome(self):
+ 		"""Get the welcome message from the server
+ 		(this is read and squirreled away by __init__()).
+ 		If the response code is 200, posting is allowed;
+ 		if it 201, posting is not allowed."""
+ 
  		if self.debugging: print '*welcome*', `self.welcome`
  		return self.welcome
  
  	def set_debuglevel(self, level):
+ 		"""Set the debugging level.  Argument 'level' means:
+ 		0: no debugging output (default)
+ 		1: print commands and responses but not body text etc.
+ 		2: also print raw lines read and sent before stripping CR/LF"""
+ 
  		self.debugging = level
  	debug = set_debuglevel
  
  	def putline(self, line):
+ 		"""Internal: send one line to the server, appending CRLF."""
  		line = line + CRLF
  		if self.debugging > 1: print '*put*', `line`
  		self.sock.send(line)
  
  	def putcmd(self, line):
+ 		"""Internal: send one command to the server (through putline())."""
  		if self.debugging: print '*cmd*', `line`
  		self.putline(line)
  
  	def getline(self):
+ 		"""Internal: return one line from the server, stripping CRLF.
+ 		Raise EOFError if the connection is closed."""
  		line = self.file.readline()
  		if self.debugging > 1:
***************
*** 123,129 ****
  		return line
  
- 	# Internal: get a response from the server.
- 	# Raise various errors if the response indicates an error
  	def getresp(self):
  		resp = self.getline()
  		if self.debugging: print '*resp*', `resp`
--- 122,128 ----
  		return line
  
  	def getresp(self):
+ 		"""Internal: get a response from the server.
+ 		Raise various errors if the response indicates an error."""
  		resp = self.getline()
  		if self.debugging: print '*resp*', `resp`
***************
*** 137,143 ****
  		return resp
  
- 	# Internal: get a response plus following text from the server.
- 	# Raise various errors if the response indicates an error
  	def getlongresp(self):
  		resp = self.getresp()
  		if resp[:3] not in LONGRESP:
--- 136,142 ----
  		return resp
  
  	def getlongresp(self):
+ 		"""Internal: get a response plus following text from the server.
+ 		Raise various errors if the response indicates an error."""
  		resp = self.getresp()
  		if resp[:3] not in LONGRESP:
***************
*** 153,193 ****
  		return resp, list
  
- 	# Internal: send a command and get the response
  	def shortcmd(self, line):
  		self.putcmd(line)
  		return self.getresp()
  
- 	# Internal: send a command and get the response plus following text
  	def longcmd(self, line):
  		self.putcmd(line)
  		return self.getlongresp()
  
- 	# Process a NEWGROUPS command.  Arguments:
- 	# - date: string 'yymmdd' indicating the date
- 	# - time: string 'hhmmss' indicating the time
- 	# Return:
- 	# - resp: server response if succesful
- 	# - list: list of newsgroup names
- 
  	def newgroups(self, date, time):
! 		return self.longcmd('NEWGROUPS ' + date + ' ' + time)
  
! 	# Process a NEWNEWS command.  Arguments:
! 	# - group: group name or '*'
! 	# - date: string 'yymmdd' indicating the date
! 	# - time: string 'hhmmss' indicating the time
! 	# Return:
! 	# - resp: server response if succesful
! 	# - list: list of article ids
  
  	def newnews(self, group, date, time):
  		cmd = 'NEWNEWS ' + group + ' ' + date + ' ' + time
  		return self.longcmd(cmd)
  
- 	# Process a LIST command.  Return:
- 	# - resp: server response if succesful
- 	# - list: list of (group, last, first, flag) (strings)
- 
  	def list(self):
  		resp, list = self.longcmd('LIST')
  		for i in range(len(list)):
--- 152,192 ----
  		return resp, list
  
  	def shortcmd(self, line):
+ 		"""Internal: send a command and get the response."""
  		self.putcmd(line)
  		return self.getresp()
  
  	def longcmd(self, line):
+ 		"""Internal: send a command and get the response plus following text."""
  		self.putcmd(line)
  		return self.getlongresp()
  
  	def newgroups(self, date, time):
! 		"""Process a NEWGROUPS command.  Arguments:
! 		- date: string 'yymmdd' indicating the date
! 		- time: string 'hhmmss' indicating the time
! 		Return:
! 		- resp: server response if succesful
! 		- list: list of newsgroup names"""
  
! 		return self.longcmd('NEWGROUPS ' + date + ' ' + time)
  
  	def newnews(self, group, date, time):
+ 		"""Process a NEWNEWS command.  Arguments:
+ 		- group: group name or '*'
+ 		- date: string 'yymmdd' indicating the date
+ 		- time: string 'hhmmss' indicating the time
+ 		Return:
+ 		- resp: server response if succesful
+ 		- list: list of article ids"""
+ 
  		cmd = 'NEWNEWS ' + group + ' ' + date + ' ' + time
  		return self.longcmd(cmd)
  
  	def list(self):
+ 		"""Process a LIST command.  Return:
+ 		- resp: server response if succesful
+ 		- list: list of (group, last, first, flag) (strings)"""
+ 
  		resp, list = self.longcmd('LIST')
  		for i in range(len(list)):
***************
*** 196,209 ****
  		return resp, list
  
- 	# Process a GROUP command.  Argument:
- 	# - group: the group name
- 	# Returns:
- 	# - resp: server response if succesful
- 	# - count: number of articles (string)
- 	# - first: first article number (string)
- 	# - last: last article number (string)
- 	# - name: the group name
- 
  	def group(self, name):
  		resp = self.shortcmd('GROUP ' + name)
  		if resp[:3] <> '211':
--- 195,208 ----
  		return resp, list
  
  	def group(self, name):
+ 		"""Process a GROUP command.  Argument:
+ 		- group: the group name
+ 		Returns:
+ 		- resp: server response if succesful
+ 		- count: number of articles (string)
+ 		- first: first article number (string)
+ 		- last: last article number (string)
+ 		- name: the group name"""
+ 
  		resp = self.shortcmd('GROUP ' + name)
  		if resp[:3] <> '211':
***************
*** 222,234 ****
  		return resp, count, first, last, name
  
- 	# Process a HELP command.  Returns:
- 	# - resp: server response if succesful
- 	# - list: list of strings
- 
  	def help(self):
  		return self.longcmd('HELP')
  
- 	# Internal: parse the response of a STAT, NEXT or LAST command
  	def statparse(self, resp):
  		if resp[:2] <> '22':
  			raise error_reply, resp
--- 221,233 ----
  		return resp, count, first, last, name
  
  	def help(self):
+ 		"""Process a HELP command.  Returns:
+ 		- resp: server response if succesful
+ 		- list: list of strings"""
+ 
  		return self.longcmd('HELP')
  
  	def statparse(self, resp):
+ 		"""Internal: parse the response of a STAT, NEXT or LAST command."""
  		if resp[:2] <> '22':
  			raise error_reply, resp
***************
*** 243,324 ****
  		return resp, nr, id
  
- 	# Internal: process a STAT, NEXT or LAST command
  	def statcmd(self, line):
  		resp = self.shortcmd(line)
  		return self.statparse(resp)
  
- 	# Process a STAT command.  Argument:
- 	# - id: article number or message id
- 	# Returns:
- 	# - resp: server response if succesful
- 	# - nr:   the article number
- 	# - id:   the article id
- 
  	def stat(self, id):
! 		return self.statcmd('STAT ' + id)
  
! 	# Process a NEXT command.  No arguments.  Return as for STAT
  
  	def next(self):
  		return self.statcmd('NEXT')
  
- 	# Process a LAST command.  No arguments.  Return as for STAT
- 
  	def last(self):
  		return self.statcmd('LAST')
  
- 	# Internal: process a HEAD, BODY or ARTICLE command
  	def artcmd(self, line):
  		resp, list = self.longcmd(line)
  		resp, nr, id = self.statparse(resp)
  		return resp, nr, id, list
  
- 	# Process a HEAD command.  Argument:
- 	# - id: article number or message id
- 	# Returns:
- 	# - resp: server response if succesful
- 	# - nr: article number
- 	# - id: message id
- 	# - list: the lines of the article's header
- 
  	def head(self, id):
! 		return self.artcmd('HEAD ' + id)
  
! 	# Process a BODY command.  Argument:
! 	# - id: article number or message id
! 	# Returns:
! 	# - resp: server response if succesful
! 	# - nr: article number
! 	# - id: message id
! 	# - list: the lines of the article's body
  
  	def body(self, id):
! 		return self.artcmd('BODY ' + id)
  
! 	# Process an ARTICLE command.  Argument:
! 	# - id: article number or message id
! 	# Returns:
! 	# - resp: server response if succesful
! 	# - nr: article number
! 	# - id: message id
! 	# - list: the lines of the article
  
  	def article(self, id):
! 		return self.artcmd('ARTICLE ' + id)
  
! 	# Process a SLAVE command.  Returns:
! 	# - resp: server response if succesful
  
  	def slave(self):
! 		return self.shortcmd('SLAVE')
  
! 	# Process an XHDR command (optional server extension).  Arguments:
! 	# - hdr: the header type (e.g. 'subject')
! 	# - str: an article nr, a message id, or a range nr1-nr2
! 	# Returns:
! 	# - resp: server response if succesful
! 	# - list: list of (nr, value) strings
  
  	def xhdr(self, hdr, str):
  		pat = re.compile('^([0-9]+) ?(.*)\n?')
  		resp, lines = self.longcmd('XHDR ' + hdr + ' ' + str)
--- 242,321 ----
  		return resp, nr, id
  
  	def statcmd(self, line):
+ 		"""Internal: process a STAT, NEXT or LAST command."""
  		resp = self.shortcmd(line)
  		return self.statparse(resp)
  
  	def stat(self, id):
! 		"""Process a STAT command.  Argument:
! 		- id: article number or message id
! 		Returns:
! 		- resp: server response if succesful
! 		- nr:   the article number
! 		- id:   the article id"""
  
! 		return self.statcmd('STAT ' + id)
  
  	def next(self):
+ 		"""Process a NEXT command.  No arguments.  Return as for STAT."""
  		return self.statcmd('NEXT')
  
  	def last(self):
+ 		"""Process a LAST command.  No arguments.  Return as for STAT."""
  		return self.statcmd('LAST')
  
  	def artcmd(self, line):
+ 		"""Internal: process a HEAD, BODY or ARTICLE command."""
  		resp, list = self.longcmd(line)
  		resp, nr, id = self.statparse(resp)
  		return resp, nr, id, list
  
  	def head(self, id):
! 		"""Process a HEAD command.  Argument:
! 		- id: article number or message id
! 		Returns:
! 		- resp: server response if succesful
! 		- nr: article number
! 		- id: message id
! 		- list: the lines of the article's header"""
  
! 		return self.artcmd('HEAD ' + id)
  
  	def body(self, id):
! 		"""Process a BODY command.  Argument:
! 		- id: article number or message id
! 		Returns:
! 		- resp: server response if succesful
! 		- nr: article number
! 		- id: message id
! 		- list: the lines of the article's body"""
  
! 		return self.artcmd('BODY ' + id)
  
  	def article(self, id):
! 		"""Process an ARTICLE command.  Argument:
! 		- id: article number or message id
! 		Returns:
! 		- resp: server response if succesful
! 		- nr: article number
! 		- id: message id
! 		- list: the lines of the article"""
  
! 		return self.artcmd('ARTICLE ' + id)
  
  	def slave(self):
! 		"""Process a SLAVE command.  Returns:
! 		- resp: server response if succesful"""
  
! 		return self.shortcmd('SLAVE')
  
  	def xhdr(self, hdr, str):
+ 		"""Process an XHDR command (optional server extension).  Arguments:
+ 		- hdr: the header type (e.g. 'subject')
+ 		- str: an article nr, a message id, or a range nr1-nr2
+ 		Returns:
+ 		- resp: server response if succesful
+ 		- list: list of (nr, value) strings"""
+ 
  		pat = re.compile('^([0-9]+) ?(.*)\n?')
  		resp, lines = self.longcmd('XHDR ' + hdr + ' ' + str)
***************
*** 330,341 ****
  		return resp, lines
  
- 	# Process an XOVER command (optional server extension) Arguments:
- 	# - start: start of range
- 	# - end: end of range
- 	# Returns:
- 	# - resp: server response if succesful
- 	# - list: list of (art-nr, subject, poster, date, id, refrences, size, lines)
- 
  	def xover(self,start,end):
  		resp, lines = self.longcmd('XOVER ' + start + '-' + end)
  		xover_lines = []
--- 327,339 ----
  		return resp, lines
  
  	def xover(self,start,end):
+ 		"""Process an XOVER command (optional server extension) Arguments:
+ 		- start: start of range
+ 		- end: end of range
+ 		Returns:
+ 		- resp: server response if succesful
+ 		- list: list of (art-nr, subject, poster, date,
+ 		                 id, references, size, lines)"""
+ 
  		resp, lines = self.longcmd('XOVER ' + start + '-' + end)
  		xover_lines = []
***************
*** 355,365 ****
  		return resp,xover_lines
  
- 	# Process an XGTITLE command (optional server extension) Arguments:
- 	# - group: group name wildcard (i.e. news.*)
- 	# Returns:
- 	# - resp: server response if succesful
- 	# - list: list of (name,title) strings
- 
  	def xgtitle(self, group):
  		line_pat = re.compile("^([^ \t]+)[ \t]+(.*)$")
  		resp, raw_lines = self.longcmd('XGTITLE ' + group)
--- 353,363 ----
  		return resp,xover_lines
  
  	def xgtitle(self, group):
+ 		"""Process an XGTITLE command (optional server extension) Arguments:
+ 		- group: group name wildcard (i.e. news.*)
+ 		Returns:
+ 		- resp: server response if succesful
+ 		- list: list of (name,title) strings"""
+ 
  		line_pat = re.compile("^([^ \t]+)[ \t]+(.*)$")
  		resp, raw_lines = self.longcmd('XGTITLE ' + group)
***************
*** 371,381 ****
  		return resp, lines
  
- 	# Process an XPATH command (optional server extension) Arguments:
- 	# - id: Message id of article
- 	# Returns:
- 	# resp: server response if succesful
- 	# path: directory path to article
- 
  	def xpath(self,id):
  		resp = self.shortcmd("XPATH " + id)
  		if resp[:3] <> '223':
--- 369,379 ----
  		return resp, lines
  
  	def xpath(self,id):
+ 		"""Process an XPATH command (optional server extension) Arguments:
+ 		- id: Message id of article
+ 		Returns:
+ 		resp: server response if succesful
+ 		path: directory path to article"""
+ 
  		resp = self.shortcmd("XPATH " + id)
  		if resp[:3] <> '223':
***************
*** 388,399 ****
  			return resp, path
  
- 	# Process the DATE command. Arguments:
- 	# None
- 	# Returns:
- 	# resp: server response if succesful
- 	# date: Date suitable for newnews/newgroups commands etc.
- 	# time: Time suitable for newnews/newgroups commands etc.
- 
  	def date (self):
  		resp = self.shortcmd("DATE")
  		if resp[:3] <> '111':
--- 386,397 ----
  			return resp, path
  
  	def date (self):
+ 		"""Process the DATE command. Arguments:
+ 		None
+ 		Returns:
+ 		resp: server response if succesful
+ 		date: Date suitable for newnews/newgroups commands etc.
+ 		time: Time suitable for newnews/newgroups commands etc."""
+ 
  		resp = self.shortcmd("DATE")
  		if resp[:3] <> '111':
***************
*** 409,418 ****
  
  
- 	# Process a POST command.  Arguments:
- 	# - f: file containing the article
- 	# Returns:
- 	# - resp: server response if succesful
- 
  	def post(self, f):
  		resp = self.shortcmd('POST')
  		# Raises error_??? if posting is not allowed
--- 407,416 ----
  
  
  	def post(self, f):
+ 		"""Process a POST command.  Arguments:
+ 		- f: file containing the article
+ 		Returns:
+ 		- resp: server response if succesful"""
+ 
  		resp = self.shortcmd('POST')
  		# Raises error_??? if posting is not allowed
***************
*** 431,442 ****
  		return self.getresp()
  
- 	# Process an IHAVE command.  Arguments:
- 	# - id: message-id of the article
- 	# - f:  file containing the article
- 	# Returns:
- 	# - resp: server response if succesful
- 	# Note that if the server refuses the article an exception is raised
- 
  	def ihave(self, id, f):
  		resp = self.shortcmd('IHAVE ' + id)
  		# Raises error_??? if the server already has it
--- 429,440 ----
  		return self.getresp()
  
  	def ihave(self, id, f):
+ 		"""Process an IHAVE command.  Arguments:
+ 		- id: message-id of the article
+ 		- f:  file containing the article
+ 		Returns:
+ 		- resp: server response if succesful
+ 		Note that if the server refuses the article an exception is raised."""
+ 
  		resp = self.shortcmd('IHAVE ' + id)
  		# Raises error_??? if the server already has it
***************
*** 455,462 ****
  		return self.getresp()
  
- 	 # Process a QUIT command and close the socket.  Returns:
- 	 # - resp: server response if succesful
- 
  	def quit(self):
  		resp = self.shortcmd('QUIT')
  		self.file.close()
--- 453,460 ----
  		return self.getresp()
  
  	def quit(self):
+ 		"""Process a QUIT command and close the socket.  Returns:
+ 		- resp: server response if succesful"""
+ 
  		resp = self.shortcmd('QUIT')
  		self.file.close()
***************
*** 466,471 ****
  
  
- # Minimal test function
  def _test():
  	s = NNTP('news')
  	resp, count, first, last, name = s.group('comp.lang.python')
--- 464,469 ----
  
  
  def _test():
+ 	"""Minimal test function."""
  	s = NNTP('news')
  	resp, count, first, last, name = s.group('comp.lang.python')

Index: nturl2path.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/nturl2path.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** nturl2path.py	1999/03/18 14:21:41	1.4
--- nturl2path.py	2000/02/04 15:10:33	1.5
***************
*** 1,5 ****
! #
! # nturl2path convert a NT pathname to a file URL and 
! # vice versa  
  
  def url2pathname(url):
--- 1,3 ----
! """Convert a NT pathname to a file URL and vice versa."""
  
  def url2pathname(url):
***************
*** 35,39 ****
  
  def pathname2url(p):
- 
  	""" Convert a DOS path name to a file url...
  		C:\foo\bar\spam.foo
--- 33,36 ----

Index: os.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/os.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** os.py	1999/11/02 20:44:07	1.28
--- os.py	2000/02/04 15:10:33	1.29
***************
*** 1,20 ****
! # os.py -- either mac, dos or posix depending on what system we're on.
  
! # This exports:
! # - all functions from either posix or mac, e.g., os.unlink, os.stat, etc.
! # - os.path is either module posixpath or macpath
! # - os.name is either 'posix' or 'mac'
! # - os.curdir is a string representing the current directory ('.' or ':')
! # - os.pardir is a string representing the parent directory ('..' or '::')
! # - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\')
! # - os.altsep is the alternatte pathname separator (None or '/')
! # - os.pathsep is the component separator used in $PATH etc
! # - os.defpath is the default search path for executables
  
! # Programs that import and use 'os' stand a better chance of being
! # portable between different platforms.  Of course, they must then
! # only use functions that are defined by all platforms (e.g., unlink
! # and opendir), and leave all pathname manipulation to os.path
! # (e.g., split and join).
  
  import sys
--- 1,21 ----
! """os.py -- either mac, dos or posix depending on what system we're on.
  
! This exports:
!   - all functions from either posix or mac, e.g., os.unlink, os.stat, etc.
!   - os.path is either module posixpath or macpath
!   - os.name is either 'posix' or 'mac'
!   - os.curdir is a string representing the current directory ('.' or ':')
!   - os.pardir is a string representing the parent directory ('..' or '::')
!   - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\')
!   - os.altsep is the alternatte pathname separator (None or '/')
!   - os.pathsep is the component separator used in $PATH etc
!   - os.defpath is the default search path for executables
  
! Programs that import and use 'os' stand a better chance of being
! portable between different platforms.  Of course, they must then
! only use functions that are defined by all platforms (e.g., unlink
! and opendir), and leave all pathname manipulation to os.path
! (e.g., split and join).
! """
  
  import sys

Index: pdb.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pdb.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** pdb.py	1999/11/03 13:10:07	1.40
--- pdb.py	2000/02/04 15:10:33	1.41
***************
*** 1,5 ****
  #! /usr/bin/env python
  
! # pdb.py -- finally, a Python debugger!
  
  # (See pdb.doc for documentation.)
--- 1,5 ----
  #! /usr/bin/env python
  
! """pdb.py -- finally, a Python debugger!"""
  
  # (See pdb.doc for documentation.)
***************
*** 107,115 ****
  	
  	def user_line(self, frame):
! 		# This function is called when we stop or break at this line
  		self.interaction(frame, None)
  	
  	def user_return(self, frame, return_value):
! 		# This function is called when a return trap is set here
  		frame.f_locals['__return__'] = return_value
  		print '--Return--'
--- 107,115 ----
  	
  	def user_line(self, frame):
! 		"""This function is called when we stop or break at this line."""
  		self.interaction(frame, None)
  	
  	def user_return(self, frame, return_value):
! 		"""This function is called when a return trap is set here."""
  		frame.f_locals['__return__'] = return_value
  		print '--Return--'
***************
*** 117,122 ****
  	
  	def user_exception(self, frame, (exc_type, exc_value, exc_traceback)):
! 		# This function is called if an exception occurs,
! 		# but only if we are to stop at or just below this level
  		frame.f_locals['__exception__'] = exc_type, exc_value
  		if type(exc_type) == type(''):
--- 117,122 ----
  	
  	def user_exception(self, frame, (exc_type, exc_value, exc_traceback)):
! 		"""This function is called if an exception occurs,
! 		but only if we are to stop at or just below this level."""
  		frame.f_locals['__exception__'] = exc_type, exc_value
  		if type(exc_type) == type(''):
***************
*** 149,153 ****
  
  	def precmd(self, line):
! 		# Handle alias expansion and ';;' separator
  		if not line:
  			return line
--- 149,153 ----
  
  	def precmd(self, line):
! 		"""Handle alias expansion and ';;' separator."""
  		if not line:
  			return line
***************
*** 263,267 ****
  	# To be overridden in derived debuggers
  	def defaultFile(self):
! 		# Produce a reasonable default
  		filename = self.curframe.f_code.co_filename
  		if filename == '<string>' and mainpyfile:
--- 263,267 ----
  	# To be overridden in derived debuggers
  	def defaultFile(self):
! 		"""Produce a reasonable default."""
  		filename = self.curframe.f_code.co_filename
  		if filename == '<string>' and mainpyfile:
***************
*** 385,389 ****
  
  	def do_ignore(self,arg):
! 		# arg is bp number followed by ignore count
  		args = string.split(arg)
  		bpnum = int(string.strip(args[0]))
--- 385,389 ----
  
  	def do_ignore(self,arg):
! 		"""arg is bp number followed by ignore count."""
  		args = string.split(arg)
  		bpnum = int(string.strip(args[0]))
***************
*** 407,414 ****
  
  	def do_clear(self, arg):
! 		# Three possibilities, tried in this order:
! 		# clear -> clear all breaks, ask for confirmation
! 		# clear file:lineno -> clear all breaks at file:lineno
! 		# clear bpno bpno ... -> clear breakpoints by number
  		if not arg:
  			try:
--- 407,414 ----
  
  	def do_clear(self, arg):
! 		"""Three possibilities, tried in this order:
! 		clear -> clear all breaks, ask for confirmation
! 		clear file:lineno -> clear all breaks at file:lineno
! 		clear bpno bpno ... -> clear breakpoints by number"""
  		if not arg:
  			try:
***************
*** 852,858 ****
  		help()
  
- 	# Helper function for break/clear parsing -- may be overridden
- 
  	def lookupmodule(self, filename):
  		root, ext = os.path.splitext(filename)
  		if ext == '':
--- 852,857 ----
  		help()
  
  	def lookupmodule(self, filename):
+ 		"""Helper function for break/clear parsing -- may be overridden."""
  		root, ext = os.path.splitext(filename)
  		if ext == '':

Index: pickle.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pickle.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** pickle.py	1999/10/10 21:14:25	1.35
--- pickle.py	2000/02/04 15:10:33	1.36
***************
*** 1,3 ****
! """create portable serialized representations of Python objects.
  
  See module cPickle for a (much) faster implementation.
--- 1,3 ----
! """Create portable serialized representations of Python objects.
  
  See module cPickle for a (much) faster implementation.
***************
*** 24,28 ****
  """
  
! __version__ = "$Revision: 1.35 $"       # Code version
  
  from types import *
--- 24,28 ----
  """
  
! __version__ = "$Revision: 1.36 $"       # Code version
  
  from types import *

Index: pipes.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pipes.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pipes.py	1999/05/03 18:12:36	1.4
--- pipes.py	2000/02/04 15:10:34	1.5
***************
*** 1,64 ****
! # Conversion pipeline templates
! # =============================
  
  
! # The problem:
! # ------------
! # 
! # Suppose you have some data that you want to convert to another format
! # (e.g. from GIF image format to PPM image format).  Maybe the
! # conversion involves several steps (e.g. piping it through compress or
! # uuencode).  Some of the conversion steps may require that their input
! # is a disk file, others may be able to read standard input; similar for
! # their output.  The input to the entire conversion may also be read
! # from a disk file or from an open file, and similar for its output.
! # 
! # The module lets you construct a pipeline template by sticking one or
! # more conversion steps together.  It will take care of creating and
! # removing temporary files if they are necessary to hold intermediate
! # data.  You can then use the template to do conversions from many
! # different sources to many different destinations.  The temporary
! # file names used are different each time the template is used.
! #
! # The templates are objects so you can create templates for many
! # different conversion steps and store them in a dictionary, for
! # instance.
! 
! 
! # Directions:
! # -----------
! #
! # To create a template:
! #   t = Template()
! #
! # To add a conversion step to a template:
! #   t.append(command, kind)
! # where kind is a string of two characters: the first is '-' if the
! # command reads its standard input or 'f' if it requires a file; the
! # second likewise for the output. The command must be valid /bin/sh
! # syntax.  If input or output files are required, they are passed as
! # $IN and $OUT; otherwise, it must be  possible to use the command in
! # a pipeline.
! #
! # To add a conversion step at the beginning:
! #   t.prepend(command, kind)
! #
! # To convert a file to another file using a template:
! #   sts = t.copy(infile, outfile)
! # If infile or outfile are the empty string, standard input is read or
! # standard output is written, respectively.  The return value is the
! # exit status of the conversion pipeline.
! # 
! # To open a file for reading or writing through a conversion pipeline:
! #   fp = t.open(file, mode)
! # where mode is 'r' to read the file, or 'w' to write it -- just like
! # for the built-in function open() or for os.popen().
! #
! # To create a new template object initialized to a given one:
! #   t2 = t.clone()
! #
! # For an example, see the function test() at the end of the file.
  
  
  import sys
  import re
--- 1,63 ----
! """Conversion pipeline templates.
  
+ The problem:
+ ------------
  
! Suppose you have some data that you want to convert to another format
! (e.g. from GIF image format to PPM image format).  Maybe the
! conversion involves several steps (e.g. piping it through compress or
! uuencode).  Some of the conversion steps may require that their input
! is a disk file, others may be able to read standard input; similar for
! their output.  The input to the entire conversion may also be read
! from a disk file or from an open file, and similar for its output.
! 
! The module lets you construct a pipeline template by sticking one or
! more conversion steps together.  It will take care of creating and
! removing temporary files if they are necessary to hold intermediate
! data.  You can then use the template to do conversions from many
! different sources to many different destinations.  The temporary
! file names used are different each time the template is used.
! 
! The templates are objects so you can create templates for many
! different conversion steps and store them in a dictionary, for
! instance.
! 
! 
! Directions:
! -----------
! 
! To create a template:
!     t = Template()
! 
! To add a conversion step to a template:
!    t.append(command, kind)
! where kind is a string of two characters: the first is '-' if the
! command reads its standard input or 'f' if it requires a file; the
! second likewise for the output. The command must be valid /bin/sh
! syntax.  If input or output files are required, they are passed as
! $IN and $OUT; otherwise, it must be  possible to use the command in
! a pipeline.
! 
! To add a conversion step at the beginning:
!    t.prepend(command, kind)
! 
! To convert a file to another file using a template:
!   sts = t.copy(infile, outfile)
! If infile or outfile are the empty string, standard input is read or
! standard output is written, respectively.  The return value is the
! exit status of the conversion pipeline.
! 
! To open a file for reading or writing through a conversion pipeline:
!    fp = t.open(file, mode)
! where mode is 'r' to read the file, or 'w' to write it -- just like
! for the built-in function open() or for os.popen().
  
+ To create a new template object initialized to a given one:
+    t2 = t.clone()
  
+ For an example, see the function test() at the end of the file.
+ """
+ 
+ 
  import sys
  import re
***************
*** 82,105 ****
  
  
- # A pipeline template is a Template object:
- 
  class Template:
  
- 	# Template() returns a fresh pipeline template
  	def __init__(self):
  		self.debugging = 0
  		self.reset()
  
- 	# t.__repr__() implements `t`
  	def __repr__(self):
  		return '<Template instance, steps=' + `self.steps` + '>'
  
- 	# t.reset() restores a pipeline template to its initial state
  	def reset(self):
  		self.steps = []
  
- 	# t.clone() returns a new pipeline template with identical
- 	# initial state as the current one
  	def clone(self):
  		t = Template()
  		t.steps = self.steps[:]
--- 81,103 ----
  
  
  class Template:
+ 	"""Class representing a pipeline template."""
  
  	def __init__(self):
+ 		"""Template() returns a fresh pipeline template."""
  		self.debugging = 0
  		self.reset()
  
  	def __repr__(self):
+ 		"""t.__repr__() implements `t`."""
  		return '<Template instance, steps=' + `self.steps` + '>'
  
  	def reset(self):
+ 		"""t.reset() restores a pipeline template to its initial state."""
  		self.steps = []
  
  	def clone(self):
+ 		"""t.clone() returns a new pipeline template with identical
+ 		initial state as the current one."""
  		t = Template()
  		t.steps = self.steps[:]
***************
*** 107,116 ****
  		return t
  
- 	# t.debug(flag) turns debugging on or off
  	def debug(self, flag):
  		self.debugging = flag
  
- 	# t.append(cmd, kind) adds a new step at the end
  	def append(self, cmd, kind):
  		if type(cmd) <> type(''):
  			raise TypeError, \
--- 105,114 ----
  		return t
  
  	def debug(self, flag):
+ 		"""t.debug(flag) turns debugging on or off."""
  		self.debugging = flag
  
  	def append(self, cmd, kind):
+ 		"""t.append(cmd, kind) adds a new step at the end."""
  		if type(cmd) <> type(''):
  			raise TypeError, \
***************
*** 133,138 ****
  		self.steps.append((cmd, kind))
  
- 	# t.prepend(cmd, kind) adds a new step at the front
  	def prepend(self, cmd, kind):
  		if type(cmd) <> type(''):
  			raise TypeError, \
--- 131,136 ----
  		self.steps.append((cmd, kind))
  
  	def prepend(self, cmd, kind):
+ 		"""t.prepend(cmd, kind) adds a new step at the front."""
  		if type(cmd) <> type(''):
  			raise TypeError, \
***************
*** 155,161 ****
  		self.steps.insert(0, (cmd, kind))
  
- 	# t.open(file, rw) returns a pipe or file object open for
- 	# reading or writing; the file is the other end of the pipeline
  	def open(self, file, rw):
  		if rw == 'r':
  			return self.open_r(file)
--- 153,159 ----
  		self.steps.insert(0, (cmd, kind))
  
  	def open(self, file, rw):
+ 		"""t.open(file, rw) returns a pipe or file object open for
+ 		reading or writing; the file is the other end of the pipeline."""
  		if rw == 'r':
  			return self.open_r(file)
***************
*** 165,172 ****
  		      'Template.open: rw must be \'r\' or \'w\', not ' + `rw`
  
- 	# t.open_r(file) and t.open_w(file) implement
- 	# t.open(file, 'r') and t.open(file, 'w') respectively
- 
  	def open_r(self, file):
  		if self.steps == []:
  			return open(file, 'r')
--- 163,169 ----
  		      'Template.open: rw must be \'r\' or \'w\', not ' + `rw`
  
  	def open_r(self, file):
+ 		"""t.open_r(file) and t.open_w(file) implement
+ 		t.open(file, 'r') and t.open(file, 'w') respectively."""
  		if self.steps == []:
  			return open(file, 'r')

Index: popen2.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/popen2.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** popen2.py	1999/04/20 12:27:31	1.8
--- popen2.py	2000/02/04 15:10:34	1.9
***************
*** 1,2 ****
--- 1,10 ----
+ """Spawn a command with pipes to its stdin, stdout, and optionally stderr.
+ 
+ The normal os.popen(cmd, mode) call spawns a shell command and provides a
+ file interface to just the input or output of the process depending on
+ whether mode is 'r' or 'w'.  This module provides the functions popen2(cmd)
+ and popen3(cmd) which return two or three pipes to the spawned command.
+ """
+ 
  import os
  import sys
***************
*** 12,16 ****
--- 20,32 ----
  
  class Popen3:
+     """Class representing a child process.  Normally instances are created
+     by the factory functions popen2() and popen3()."""
+ 
      def __init__(self, cmd, capturestderr=0, bufsize=-1):
+         """The parameter 'cmd' is the shell command to execute in a
+         sub-process.  The 'capturestderr' flag, if true, specifies that
+         the object should capture standard error output of the child process.
+         The default is false.  If the 'bufsize' parameter is specified, it
+         specifies the size of the I/O buffers to/from the child process."""
          if type(cmd) == type(''):
              cmd = ['/bin/sh', '-c', cmd]
***************
*** 52,56 ****
--- 68,75 ----
          self.sts = -1 # Child not completed yet
          _active.append(self)
+ 
      def poll(self):
+         """Return the exit status of the child process if it has finished,
+         or -1 if it hasn't finished yet."""
          if self.sts < 0:
              try:
***************
*** 62,66 ****
--- 81,87 ----
                  pass
          return self.sts
+ 
      def wait(self):
+         """Wait for and return the exit status of the child process."""
          pid, sts = os.waitpid(self.pid, 0)
          if pid == self.pid:
***************
*** 70,73 ****
--- 91,97 ----
  
  def popen2(cmd, bufsize=-1):
+     """Execute the shell command 'cmd' in a sub-process.  If 'bufsize' is
+     specified, it sets the buffer size for the I/O pipes.  The file objects
+     (child_stdout, child_stdin) are returned."""
      _cleanup()
      inst = Popen3(cmd, 0, bufsize)
***************
*** 75,78 ****
--- 99,105 ----
  
  def popen3(cmd, bufsize=-1):
+     """Execute the shell command 'cmd' in a sub-process.  If 'bufsize' is
+     specified, it sets the buffer size for the I/O pipes.  The file objects
+     (child_stdout, child_stdin, child_stderr) are returned."""
      _cleanup()
      inst = Popen3(cmd, 1, bufsize)

Index: posixfile.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/posixfile.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** posixfile.py	1999/12/06 14:51:05	1.12
--- posixfile.py	2000/02/04 15:10:34	1.13
***************
*** 1,63 ****
! #
! # Start of posixfile.py
! #
! 
! #
! # Extended file operations
! #
! # f = posixfile.open(filename, [mode, [bufsize]])
! #       will create a new posixfile object
! #
! # f = posixfile.fileopen(fileobject)
! #       will create a posixfile object from a builtin file object
! #
! # f.file()
! #       will return the original builtin file object
! #
! # f.dup()
! #       will return a new file object based on a new filedescriptor
! #
! # f.dup2(fd)
! #       will return a new file object based on the given filedescriptor
! #
! # f.flags(mode)
! #       will turn on the associated flag (merge)
! #       mode can contain the following characters:
! #
! #   (character representing a flag)
! #       a       append only flag
! #       c       close on exec flag
! #       n       no delay flag
! #       s       synchronization flag
! #   (modifiers)
! #       !       turn flags 'off' instead of default 'on'
! #       =       copy flags 'as is' instead of default 'merge'
! #       ?       return a string in which the characters represent the flags
! #               that are set
! #
! #       note: - the '!' and '=' modifiers are mutually exclusive.
! #             - the '?' modifier will return the status of the flags after they
! #               have been changed by other characters in the mode string
! #
! # f.lock(mode [, len [, start [, whence]]])
! #       will (un)lock a region
! #       mode can contain the following characters:
! #
! #   (character representing type of lock)
! #       u       unlock
! #       r       read lock
! #       w       write lock
! #   (modifiers)
! #       |       wait until the lock can be granted
! #       ?       return the first lock conflicting with the requested lock
! #               or 'None' if there is no conflict. The lock returned is in the
! #               format (mode, len, start, whence, pid) where mode is a
! #               character representing the type of lock ('r' or 'w')
! #
! #       note: - the '?' modifier prevents a region from being locked; it is
! #               query only
! #
  
  class _posixfile_:
      states = ['open', 'closed']
  
--- 1,60 ----
! """Extended file operations available in POSIX.
  
+ f = posixfile.open(filename, [mode, [bufsize]])
+       will create a new posixfile object
+ 
+ f = posixfile.fileopen(fileobject)
+       will create a posixfile object from a builtin file object
+ 
+ f.file()
+       will return the original builtin file object
+ 
+ f.dup()
+       will return a new file object based on a new filedescriptor
+ 
+ f.dup2(fd)
+       will return a new file object based on the given filedescriptor
+ 
+ f.flags(mode)
+       will turn on the associated flag (merge)
+       mode can contain the following characters:
+ 
+   (character representing a flag)
+       a       append only flag
+       c       close on exec flag
+       n       no delay flag
+       s       synchronization flag
+   (modifiers)
+       !       turn flags 'off' instead of default 'on'
+       =       copy flags 'as is' instead of default 'merge'
+       ?       return a string in which the characters represent the flags
+               that are set
+ 
+       note: - the '!' and '=' modifiers are mutually exclusive.
+             - the '?' modifier will return the status of the flags after they
+               have been changed by other characters in the mode string
+ 
+ f.lock(mode [, len [, start [, whence]]])
+       will (un)lock a region
+       mode can contain the following characters:
+ 
+   (character representing type of lock)
+       u       unlock
+       r       read lock
+       w       write lock
+   (modifiers)
+       |       wait until the lock can be granted
+       ?       return the first lock conflicting with the requested lock
+               or 'None' if there is no conflict. The lock returned is in the
+               format (mode, len, start, whence, pid) where mode is a
+               character representing the type of lock ('r' or 'w')
+ 
+       note: - the '?' modifier prevents a region from being locked; it is
+               query only
+ """
+ 
  class _posixfile_:
+     """File wrapper class that provides extra POSIX file routines."""
+ 
      states = ['open', 'closed']
  
***************
*** 216,226 ****
                      return 'w', l_len, l_start, l_whence, l_pid
  
- #
- # Public routine to obtain a posixfile object
- #
  def open(name, mode='r', bufsize=-1):
      return _posixfile_().open(name, mode, bufsize)
  
  def fileopen(file):
      return _posixfile_().fileopen(file)
  
--- 213,222 ----
                      return 'w', l_len, l_start, l_whence, l_pid
  
  def open(name, mode='r', bufsize=-1):
+     """Public routine to open a file as a posixfile object."""
      return _posixfile_().open(name, mode, bufsize)
  
  def fileopen(file):
+     """Public routine to get a posixfile object from a Python file object."""
      return _posixfile_().fileopen(file)
  

Index: posixpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/posixpath.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** posixpath.py	1999/11/02 13:28:19	1.26
--- posixpath.py	2000/02/04 15:10:34	1.27
***************
*** 1,12 ****
! # Module 'posixpath' -- common operations on Posix pathnames.
! # Some of this can actually be useful on non-Posix systems too, e.g.
! # for manipulation of the pathname component of URLs.
! # The "os.path" name is an alias for this module on Posix systems;
! # on other systems (e.g. Mac, Windows), os.path provides the same
! # operations in a manner specific to that platform, and is an alias
! # to another module (e.g. macpath, ntpath).
! """Common pathname manipulations, Posix version. 
! Instead of importing this module
! directly, import os and refer to this module as os.path.
  """
  
--- 1,12 ----
! """Common operations on Posix pathnames.
! 
! Instead of importing this module directly, import os and refer to
! this module as os.path.  The "os.path" name is an alias for this
! module on Posix systems; on other systems (e.g. Mac, Windows),
! os.path provides the same operations in a manner specific to that
! platform, and is an alias to another module (e.g. macpath, ntpath).
! 
! Some of this can actually be useful on non-Posix systems too, e.g.
! for manipulation of the pathname component of URLs.
  """
  
***************
*** 370,375 ****
  
  
- # Return an absolute path.
  def abspath(path):
      if not isabs(path):
          path = join(os.getcwd(), path)
--- 370,375 ----
  
  
  def abspath(path):
+     """Return an absolute path."""
      if not isabs(path):
          path = join(os.getcwd(), path)

Index: profile.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/profile.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** profile.py	1999/05/03 18:13:29	1.21
--- profile.py	2000/02/04 15:10:34	1.22
***************
*** 8,11 ****
--- 8,12 ----
  # See profile.doc for more information
  
+ """Class for profiling Python code."""
  
  # Copyright 1994, by InfoSeek Corporation, all rights reserved.
***************
*** 80,121 ****
  
  
- #**************************************************************************
- # class Profile documentation:
- #**************************************************************************
- # self.cur is always a tuple.  Each such tuple corresponds to a stack
- # frame that is currently active (self.cur[-2]).  The following are the
- # definitions of its members.  We use this external "parallel stack" to
- # avoid contaminating the program that we are profiling. (old profiler
- # used to write into the frames local dictionary!!) Derived classes
- # can change the definition of some entries, as long as they leave
- # [-2:] intact.
- #
- # [ 0] = Time that needs to be charged to the parent frame's function.  It is
- #        used so that a function call will not have to access the timing data
- #        for the parents frame.
- # [ 1] = Total time spent in this frame's function, excluding time in
- #        subfunctions
- # [ 2] = Cumulative time spent in this frame's function, including time in
- #        all subfunctions to this frame.
- # [-3] = Name of the function that corresonds to this frame.  
- # [-2] = Actual frame that we correspond to (used to sync exception handling)
- # [-1] = Our parent 6-tuple (corresonds to frame.f_back)
- #**************************************************************************
- # Timing data for each function is stored as a 5-tuple in the dictionary
- # self.timings[].  The index is always the name stored in self.cur[4].
- # The following are the definitions of the members:
- #
- # [0] = The number of times this function was called, not counting direct
- #       or indirect recursion,
- # [1] = Number of times this function appears on the stack, minus one
- # [2] = Total time spent internal to this function
- # [3] = Cumulative time that this function was present on the stack.  In
- #       non-recursive functions, this is the total execution time from start
- #       to finish of each invocation of a function, including time spent in
- #       all subfunctions.
- # [5] = A dictionary indicating for each function name, the number of times
- #       it was called by us.
- #**************************************************************************
  class Profile:
  
  	def __init__(self, timer=None):
--- 81,121 ----
  
  
  class Profile:
+ 	"""Profiler class.
+ 	
+ 	self.cur is always a tuple.  Each such tuple corresponds to a stack
+ 	frame that is currently active (self.cur[-2]).  The following are the
+ 	definitions of its members.  We use this external "parallel stack" to
+ 	avoid contaminating the program that we are profiling. (old profiler
+ 	used to write into the frames local dictionary!!) Derived classes
+ 	can change the definition of some entries, as long as they leave
+ 	[-2:] intact.
+ 
+ 	[ 0] = Time that needs to be charged to the parent frame's function.
+ 	       It is used so that a function call will not have to access the
+ 	       timing data for the parent frame.
+ 	[ 1] = Total time spent in this frame's function, excluding time in
+ 	       subfunctions
+ 	[ 2] = Cumulative time spent in this frame's function, including time in
+ 	       all subfunctions to this frame.
+ 	[-3] = Name of the function that corresonds to this frame.  
+ 	[-2] = Actual frame that we correspond to (used to sync exception handling)
+ 	[-1] = Our parent 6-tuple (corresonds to frame.f_back)
+ 
+ 	Timing data for each function is stored as a 5-tuple in the dictionary
+ 	self.timings[].  The index is always the name stored in self.cur[4].
+ 	The following are the definitions of the members:
+ 
+ 	[0] = The number of times this function was called, not counting direct
+ 	      or indirect recursion,
+ 	[1] = Number of times this function appears on the stack, minus one
+ 	[2] = Total time spent internal to this function
+ 	[3] = Cumulative time that this function was present on the stack.  In
+ 	      non-recursive functions, this is the total execution time from start
+ 	      to finish of each invocation of a function, including time spent in
+ 	      all subfunctions.
+ 	[5] = A dictionary indicating for each function name, the number of times
+ 	      it was called by us.
+ 	"""
  
  	def __init__(self, timer=None):
***************
*** 450,466 ****
  
  
- #****************************************************************************
- # OldProfile class documentation
- #****************************************************************************
- #
- # The following derived profiler simulates the old style profile, providing
- # errant results on recursive functions. The reason for the usefulnes of this
- # profiler is that it runs faster (i.e., less overhead).  It still creates
- # all the caller stats, and is quite useful when there is *no* recursion
- # in the user's code.
- #
- # This code also shows how easy it is to create a modified profiler.
- #****************************************************************************
  class OldProfile(Profile):
  	def trace_dispatch_exception(self, frame, t):
  		rt, rtt, rct, rfn, rframe, rcur = self.cur
--- 450,463 ----
  
  
  class OldProfile(Profile):
+ 	"""A derived profiler that simulates the old style profile, providing
+ 	errant results on recursive functions. The reason for the usefulness of
+ 	this profiler is that it runs faster (i.e., less overhead).  It still
+ 	creates all the caller stats, and is quite useful when there is *no*
+ 	recursion in the user's code.
+ 	
+ 	This code also shows how easy it is to create a modified profiler.
+ 	"""
+ 
  	def trace_dispatch_exception(self, frame, t):
  		rt, rtt, rct, rfn, rframe, rcur = self.cur
***************
*** 510,523 ****
  		
  
- #****************************************************************************
- # HotProfile class documentation
- #****************************************************************************
- #
- # This profiler is the fastest derived profile example.  It does not
- # calculate caller-callee relationships, and does not calculate cumulative
- # time under a function.  It only calculates time spent in a function, so
- # it runs very quickly (re: very low overhead)
- #****************************************************************************
  class HotProfile(Profile):
  	def trace_dispatch_exception(self, frame, t):
  		rt, rtt, rfn, rframe, rcur = self.cur
--- 507,517 ----
  		
  
  class HotProfile(Profile):
+ 	"""The fastest derived profile example.  It does not calculate
+ 	caller-callee relationships, and does not calculate cumulative
+ 	time under a function.  It only calculates time spent in a
+ 	function, so it runs very quickly due to its very low overhead.
+ 	"""
+ 
  	def trace_dispatch_exception(self, frame, t):
  		rt, rtt, rfn, rframe, rcur = self.cur

Index: pstats.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pstats.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pstats.py	1999/04/13 04:24:22	1.6
--- pstats.py	2000/02/04 15:10:34	1.7
***************
*** 1,3 ****
! #
  # Class for printing reports on profiled python code. rev 1.0  4/1/94
  #
--- 1,4 ----
! """Class for printing reports on profiled python code."""
! 
  # Class for printing reports on profiled python code. rev 1.0  4/1/94
  #
***************
*** 38,76 ****
  import re
  
- #**************************************************************************
- # Class Stats documentation
- #**************************************************************************
- # This class is used for creating reports from data generated by the
- # Profile class.  It is a "friend" of that class, and imports data either
- # by direct access to members of Profile class, or by reading in a dictionary
- # that was emitted (via marshal) from the Profile class.
- #
- # The big change from the previous Profiler (in terms of raw functionality)
- # is that an "add()" method has been provided to combine Stats from
- # several distinct profile runs.  Both the constructor and the add()
- # method now take arbitrarilly many file names as arguments.
- #
- # All the print methods now take an argument that indicats how many lines
- # to print.  If the arg is a floating point number between 0 and 1.0, then
- # it is taken as a decimal percentage of the availabel lines to be printed
- # (e.g., .1 means print 10% of all available lines).  If it is an integer,
- # it is taken to mean the number of lines of data that you wish to have
- # printed.
- #
- # The sort_stats() method now processes some additionaly options (i.e., in
- # addition to the old -1, 0, 1, or 2).  It takes an arbitrary number of quoted
- # strings to select the sort order.  For example sort_stats('time', 'name')
- # sorts on the major key of "internal function time", and on the minor
- # key of 'the name of the function'.  Look at the two tables in sort_stats()
- # and get_sort_arg_defs(self) for more examples.
- #
- # All methods now return "self",  so you can string together commands like:
- #    Stats('foo', 'goo').strip_dirs().sort_stats('calls').\
- #                               print_stats(5).print_callers(5)
- # 
- #**************************************************************************
  import fpformat
  
  class Stats:
  	def __init__(self, *args):
  		if not len(args):
--- 39,74 ----
  import re
  
  import fpformat
  
  class Stats:
+ 	"""This class is used for creating reports from data generated by the
+ 	Profile class.  It is a "friend" of that class, and imports data either
+ 	by direct access to members of Profile class, or by reading in a dictionary
+ 	that was emitted (via marshal) from the Profile class.
+ 
+ 	The big change from the previous Profiler (in terms of raw functionality)
+ 	is that an "add()" method has been provided to combine Stats from
+ 	several distinct profile runs.  Both the constructor and the add()
+ 	method now take arbitrarilly many file names as arguments.
+ 
+ 	All the print methods now take an argument that indicats how many lines
+ 	to print.  If the arg is a floating point number between 0 and 1.0, then
+ 	it is taken as a decimal percentage of the availabel lines to be printed
+ 	(e.g., .1 means print 10% of all available lines).  If it is an integer,
+ 	it is taken to mean the number of lines of data that you wish to have
+ 	printed.
+ 
+ 	The sort_stats() method now processes some additionaly options (i.e., in
+ 	addition to the old -1, 0, 1, or 2).  It takes an arbitrary number of quoted
+ 	strings to select the sort order.  For example sort_stats('time', 'name')
+ 	sorts on the major key of "internal function time", and on the minor
+ 	key of 'the name of the function'.  Look at the two tables in sort_stats()
+ 	and get_sort_arg_defs(self) for more examples.
+ 
+ 	All methods now return "self",  so you can string together commands like:
+ 	    Stats('foo', 'goo').strip_dirs().sort_stats('calls').\
+ 	                        print_stats(5).print_callers(5)
+ 	"""
+ 	
  	def __init__(self, *args):
  		if not len(args):
***************
*** 183,188 ****
  		  }
  
- 	# Expand all abbreviations that are unique
  	def get_sort_arg_defs(self):
  		if not self.sort_arg_dict:
  			self.sort_arg_dict = dict = {}
--- 181,186 ----
  		  }
  
  	def get_sort_arg_defs(self):
+ 		"""Expand all abbreviations that are unique."""
  		if not self.sort_arg_dict:
  			self.sort_arg_dict = dict = {}
***************
*** 290,296 ****
  		return
  
!         #******************************************************************
  	# The following functions support actual printing of reports
!         #******************************************************************
  
  	# Optional "amount" is either a line count, or a percentage of lines.
--- 288,294 ----
  		return
  
! 	#******************************************************************
  	# The following functions support actual printing of reports
! 	#******************************************************************
  
  	# Optional "amount" is either a line count, or a percentage of lines.
***************
*** 448,462 ****
  
  
- #**************************************************************************
- # class TupleComp Documentation
- #**************************************************************************
- # This class provides a generic function for comparing any two tuples.
- # Each instance records a list of tuple-indicies (from most significant
- # to least significant), and sort direction (ascending or decending) for
- # each tuple-index.  The compare functions can then be used as the function
- # argument to the system sort() function when a list of tuples need to be
- # sorted in the instances order.
- #**************************************************************************
  class TupleComp:
  	def __init__(self, comp_select_list):
  		self.comp_select_list = comp_select_list
--- 446,457 ----
  
  
  class TupleComp:
+ 	"""This class provides a generic function for comparing any two tuples.
+ 	Each instance records a list of tuple-indicies (from most significant
+ 	to least significant), and sort direction (ascending or decending) for
+ 	each tuple-index.  The compare functions can then be used as the function
+ 	argument to the system sort() function when a list of tuples need to be
+ 	sorted in the instances order."""
+ 
  	def __init__(self, comp_select_list):
  		self.comp_select_list = comp_select_list
***************
*** 496,501 ****
  #**************************************************************************
  
!     # Add together all the stats for two profile entries
! def add_func_stats(target, source):				
  	cc, nc, tt, ct, callers = source
  	t_cc, t_nc, t_tt, t_ct, t_callers = target
--- 491,496 ----
  #**************************************************************************
  
! def add_func_stats(target, source):
! 	"""Add together all the stats for two profile entries."""
  	cc, nc, tt, ct, callers = source
  	t_cc, t_nc, t_tt, t_ct, t_callers = target
***************
*** 504,509 ****
  
  
-     # Combine two caller lists in a single list.
  def add_callers(target, source):
  	new_callers = {}
  	for func in target.keys():
--- 499,504 ----
  
  
  def add_callers(target, source):
+ 	"""Combine two caller lists in a single list."""
  	new_callers = {}
  	for func in target.keys():
***************
*** 516,521 ****
  	return new_callers
  
-      # Sum the caller statistics to get total number of calls recieved
  def count_calls(callers):
  	nc = 0
  	for func in callers.keys():
--- 511,516 ----
  	return new_callers
  
  def count_calls(callers):
+ 	"""Sum the caller statistics to get total number of calls received."""
  	nc = 0
  	for func in callers.keys():
***************
*** 529,532 ****
  def f8(x):
  	return string.rjust(fpformat.fix(x, 3), 8)
- 
  
--- 524,526 ----

Index: pty.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pty.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pty.py	1999/05/03 18:13:51	1.2
--- pty.py	2000/02/04 15:10:34	1.3
***************
*** 1,3 ****
! # pty.py -- Pseudo terminal utilities.
  
  # Bugs: No signal handling.  Doesn't set slave termios and window size.
--- 1,3 ----
! """Pseudo terminal utilities."""
  
  # Bugs: No signal handling.  Doesn't set slave termios and window size.
***************
*** 17,22 ****
  CHILD = 0
  
- # Open pty master.  Returns (master_fd, tty_name).  SGI and Linux/BSD version.
  def master_open():
  	try:
  		import sgi
--- 17,23 ----
  CHILD = 0
  
  def master_open():
+ 	"""Open pty master and return (master_fd, tty_name).
+ 	SGI and Linux/BSD version."""
  	try:
  		import sgi
***************
*** 39,50 ****
  	raise os.error, 'out of pty devices'
  
- # Open the pty slave.  Acquire the controlling terminal.
- # Returns file descriptor.  Linux version.  (Should be universal? --Guido)
  def slave_open(tty_name):
  	return os.open(tty_name, FCNTL.O_RDWR)
  
- # Fork and make the child a session leader with a controlling terminal.
- # Returns (pid, master_fd)
  def fork():
  	master_fd, tty_name = master_open() 
  	pid = os.fork()
--- 40,52 ----
  	raise os.error, 'out of pty devices'
  
  def slave_open(tty_name):
+ 	"""Open the pty slave and acquire the controlling terminal.
+ 	Return the file descriptor.  Linux version."""
+ 	# (Should be universal? --Guido)
  	return os.open(tty_name, FCNTL.O_RDWR)
  
  def fork():
+ 	"""Fork and make the child a session leader with a controlling terminal.
+ 	Return (pid, master_fd)."""
  	master_fd, tty_name = master_open() 
  	pid = os.fork()
***************
*** 67,85 ****
  	return pid, master_fd
  
- # Write all the data to a descriptor.
  def writen(fd, data):
  	while data != '':
  		n = os.write(fd, data)
  		data = data[n:]
  
- # Default read function.
  def read(fd):
  	return os.read(fd, 1024)
  
- # Parent copy loop.
- # Copies  
- # 	pty master -> standard output	(master_read)
- # 	standard input -> pty master	(stdin_read)
  def copy(master_fd, master_read=read, stdin_read=read):
  	while 1:
  		rfds, wfds, xfds = select(
--- 69,87 ----
  	return pid, master_fd
  
  def writen(fd, data):
+ 	"""Write all the data to a descriptor."""
  	while data != '':
  		n = os.write(fd, data)
  		data = data[n:]
  
  def read(fd):
+ 	"""Default read function."""
  	return os.read(fd, 1024)
  
  def copy(master_fd, master_read=read, stdin_read=read):
+ 	"""Parent copy loop.
+ 	Copies  
+ 	  	pty master -> standard output	(master_read)
+ 	  	standard input -> pty master	(stdin_read)"""
  	while 1:
  		rfds, wfds, xfds = select(
***************
*** 92,97 ****
  			writen(master_fd, data)
  
- # Create a spawned process.
  def spawn(argv, master_read=read, stdin_read=read):
  	if type(argv) == type(''):
  		argv = (argv,)
--- 94,99 ----
  			writen(master_fd, data)
  
  def spawn(argv, master_read=read, stdin_read=read):
+ 	"""Create a spawned process."""
  	if type(argv) == type(''):
  		argv = (argv,)

Index: py_compile.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/py_compile.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** py_compile.py	1998/10/07 14:06:03	1.14
--- py_compile.py	2000/02/04 15:10:34	1.15
***************
*** 8,12 ****
  
  def wr_long(f, x):
!     "Internal; write a 32-bit int to a file in little-endian order."
      f.write(chr( x        & 0xff))
      f.write(chr((x >> 8)  & 0xff))
--- 8,12 ----
  
  def wr_long(f, x):
!     """Internal; write a 32-bit int to a file in little-endian order."""
      f.write(chr( x        & 0xff))
      f.write(chr((x >> 8)  & 0xff))



From guido@cnri.reston.va.us  Fri Feb  4 15:28:48 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 4 Feb 2000 10:28:48 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib quopri.py,1.5,1.6 random.py,1.12,1.13 regex_syntax.py,1.2,1.3 regsub.py,1.6,1.7 repr.py,1.5,1.6 sgmllib.py,1.18,1.19 shlex.py,1.4,1.5 shutil.py,1.14,1.15 stat.py,1.6,1.7 statcache.py,1.5,1.6 statvfs.py,1.3,1.4 string.py,1.45,1.46 sunau.py,1.14,1.15 sunaudio.py,1.3,1.4 symbol.py,1.8,1.9 tempfile.py,1.19,1.20 threading.py,1.5,1.6 toaiff.py,1.4,1.5 token.py,1.6,1.7 traceback.py,1.13,1.14 tty.py,1.1,1.2 types.py,1.12,1.13 tzparse.py,1.6,1.7 urllib.py,1.90,1.91 urllib2.py,1.1,1.2 urlparse.py,1.21,1.22 uu.py,1.10,1.11 wave.py,1.8,1.9 whrandom.py,1.14,1.15
Message-ID: <200002041528.KAA09987@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	quopri.py random.py regex_syntax.py regsub.py repr.py 
	sgmllib.py shlex.py shutil.py stat.py statcache.py statvfs.py 
	string.py sunau.py sunaudio.py symbol.py tempfile.py 
	threading.py toaiff.py token.py traceback.py tty.py types.py 
	tzparse.py urllib.py urllib2.py urlparse.py uu.py wave.py 
	whrandom.py 
Log Message:
The third and final doc-string sweep by Ka-Ping Yee.

The attached patches update the standard library so that all modules
have docstrings beginning with one-line summaries.

A new docstring was added to formatter.  The docstring for os.py
was updated to mention nt, os2, ce in addition to posix, dos, mac.



Index: quopri.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/quopri.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** quopri.py	1998/03/26 20:52:26	1.5
--- quopri.py	2000/02/04 15:28:40	1.6
***************
*** 1,5 ****
  #! /usr/bin/env python
  
! # Conversions to/from quoted-printable transport encoding as per RFC-1521
  # (Dec 1991 version).
  
--- 1,6 ----
  #! /usr/bin/env python
  
! """Conversions to/from quoted-printable transport encoding as per RFC-1521."""
! 
  # (Dec 1991 version).
  
***************
*** 9,12 ****
--- 10,16 ----
  
  def needsquoting(c, quotetabs):
+ 	"""Decide whether a particular character needs to be quoted.
+ 
+ 	The 'quotetabs' flag indicates whether tabs should be quoted."""
  	if c == '\t':
  		return not quotetabs
***************
*** 14,17 ****
--- 18,22 ----
  
  def quote(c):
+ 	"""Quote a single character."""
  	if c == ESCAPE:
  		return ESCAPE * 2
***************
*** 21,24 ****
--- 26,33 ----
  
  def encode(input, output, quotetabs):
+ 	"""Read 'input', apply quoted-printable encoding, and write to 'output'.
+ 
+ 	'input' and 'output' are files with readline() and write() methods.
+ 	The 'quotetabs' flag indicates whether tabs should be quoted."""
  	while 1:
  		line = input.readline()
***************
*** 43,46 ****
--- 52,58 ----
  
  def decode(input, output):
+ 	"""Read 'input', apply quoted-printable decoding, and write to 'output'.
+ 
+ 	'input' and 'output' are files with readline() and write() methods."""
  	new = ''
  	while 1:
***************
*** 74,80 ****
--- 86,94 ----
  
  def ishex(c):
+ 	"""Return true if the character 'c' is a hexadecimal digit."""
  	return '0' <= c <= '9' or 'a' <= c <= 'f' or 'A' <= c <= 'F'
  
  def unhex(s):
+ 	"""Get the integer value of a hexadecimal number."""
  	bits = 0
  	for c in s:

Index: random.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/random.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** random.py	1999/08/18 13:53:28	1.12
--- random.py	2000/02/04 15:28:40	1.13
***************
*** 1,22 ****
! #	R A N D O M   V A R I A B L E   G E N E R A T O R S
! #
! #	distributions on the real line:
! #	------------------------------
! #	       normal (Gaussian)
! #	       lognormal
! #	       negative exponential
! #	       gamma
! #	       beta
! #
! #	distributions on the circle (angles 0 to 2pi)
! #	---------------------------------------------
! #	       circular uniform
! #	       von Mises
  
! # Translated from anonymously contributed C/C++ source.
  
! # Multi-threading note: the random number generator used here is not
! # thread-safe; it is possible that two calls return the same random
! # value.  See whrandom.py for more info.
  
  import whrandom
--- 1,23 ----
! """Random variable generators.
  
!     distributions on the real line:
!     ------------------------------
!            normal (Gaussian)
!            lognormal
!            negative exponential
!            gamma
!            beta
  
!     distributions on the circle (angles 0 to 2pi)
!     ---------------------------------------------
!            circular uniform
!            von Mises
! 
! Translated from anonymously contributed C/C++ source.
! 
! Multi-threading note: the random number generator used here is not
! thread-safe; it is possible that two calls return the same random
! value.  See whrandom.py for more info.
! """
  
  import whrandom

Index: regex_syntax.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/regex_syntax.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** regex_syntax.py	1997/10/22 16:28:53	1.2
--- regex_syntax.py	2000/02/04 15:28:40	1.3
***************
*** 1,4 ****
! # These bits are passed to regex.set_syntax() to choose among
! # alternative regexp syntaxes.
  
  # 1 means plain parentheses serve as grouping, and backslash
--- 1,10 ----
! """Constants for selecting regexp syntaxes for the obsolete regex module.
! 
! This module is only for backward compatibility.  "regex" has now
! been replaced by the new regular expression module, "re".
! 
! These bits are passed to regex.set_syntax() to choose among
! alternative regexp syntaxes.
! """
  
  # 1 means plain parentheses serve as grouping, and backslash

Index: regsub.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/regsub.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** regsub.py	1997/02/18 18:52:55	1.6
--- regsub.py	2000/02/04 15:28:40	1.7
***************
*** 1,9 ****
! # Regular expression subroutines:
! # sub(pat, repl, str): replace first occurrence of pattern in string
! # gsub(pat, repl, str): replace all occurrences of pattern in string
! # split(str, pat, maxsplit): split string using pattern as delimiter
! # splitx(str, pat, maxsplit): split string using pattern as delimiter plus
! #			      return delimiters
  
  
  import regex
--- 1,13 ----
! """Regexp-based split and replace using the obsolete regex module.
  
+ This module is only for backward compatibility.  These operations
+ are now provided by the new regular expression module, "re".
+ 
+ sub(pat, repl, str):        replace first occurrence of pattern in string
+ gsub(pat, repl, str):       replace all occurrences of pattern in string
+ split(str, pat, maxsplit):  split string using pattern as delimiter
+ splitx(str, pat, maxsplit): split string using pattern as delimiter plus
+                             return delimiters
+ """
  
  import regex

Index: repr.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/repr.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** repr.py	1999/06/23 23:27:05	1.5
--- repr.py	2000/02/04 15:28:40	1.6
***************
*** 1,3 ****
! # Redo the `...` (representation) but with limits on most sizes.
  
  import string
--- 1,3 ----
! """Redo the `...` (representation) but with limits on most sizes."""
  
  import string

Index: sgmllib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/sgmllib.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** sgmllib.py	1999/01/25 21:57:07	1.18
--- sgmllib.py	2000/02/04 15:28:40	1.19
***************
*** 1,3 ****
! # A parser for SGML, using the derived class as static DTD.
  
  # XXX This only supports those SGML features used by HTML.
--- 1,3 ----
! """A parser for SGML, using the derived class as a static DTD."""
  
  # XXX This only supports those SGML features used by HTML.

Index: shlex.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/shlex.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** shlex.py	1999/05/03 18:14:16	1.4
--- shlex.py	2000/02/04 15:28:40	1.5
***************
*** 1,2 ****
--- 1,4 ----
+ """A lexical analyzer class for simple shell-like syntaxes."""
+ 
  # Module and documentation by Eric S. Raymond, 21 Dec 1998 
  

Index: shutil.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/shutil.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** shutil.py	1999/08/18 20:03:17	1.14
--- shutil.py	2000/02/04 15:28:41	1.15
***************
*** 1,3 ****
! """Utility functions for copying files.
  
  XXX The functions here don't copy the resource fork or other metadata on Mac.
--- 1,3 ----
! """Utility functions for copying files and directory trees.
  
  XXX The functions here don't copy the resource fork or other metadata on Mac.

Index: stat.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/stat.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** stat.py	1994/08/23 13:32:17	1.6
--- stat.py	2000/02/04 15:28:41	1.7
***************
*** 1,9 ****
! # Module 'stat'
! #
! # Defines constants and functions for interpreting stat/lstat struct
! # as returned by os.stat() and os.lstat() (if it exists).
! #
! # Suggested usage: from stat import *
! #
  # XXX Strictly spoken, this module may have to be adapted for each POSIX
  # implementation; in practice, however, the numeric constants used by
--- 1,7 ----
! """Constants/functions for interpreting results of os.stat() and os.lstat().
! 
! Suggested usage: from stat import *
! """
! 
  # XXX Strictly spoken, this module may have to be adapted for each POSIX
  # implementation; in practice, however, the numeric constants used by

Index: statcache.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/statcache.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** statcache.py	1995/12/07 10:16:45	1.5
--- statcache.py	2000/02/04 15:28:41	1.6
***************
*** 1,6 ****
! # Module 'statcache'
! #
! # Maintain a cache of file stats.
! # There are functions to reset the cache or to selectively remove items.
  
  import os
--- 1,5 ----
! """Maintain a cache of file stats.
! There are functions to reset the cache or to selectively remove items.
! """
  
  import os
***************
*** 13,19 ****
  
  
- # Stat a file, possibly out of the cache.
- #
  def stat(path):
  	if cache.has_key(path):
  		return cache[path]
--- 12,17 ----
  
  
  def stat(path):
+ 	"""Stat a file, possibly out of the cache."""
  	if cache.has_key(path):
  		return cache[path]
***************
*** 22,42 ****
  
  
- # Reset the cache completely.
- #
  def reset():
  	global cache
  	cache = {}
  
  
- # Remove a given item from the cache, if it exists.
- #
  def forget(path):
  	if cache.has_key(path):
  		del cache[path]
  
  
- # Remove all pathnames with a given prefix.
- #
  def forget_prefix(prefix):
  	n = len(prefix)
  	for path in cache.keys():
--- 20,37 ----
  
  
  def reset():
+ 	"""Reset the cache completely."""
  	global cache
  	cache = {}
  
  
  def forget(path):
+ 	"""Remove a given item from the cache, if it exists."""
  	if cache.has_key(path):
  		del cache[path]
  
  
  def forget_prefix(prefix):
+ 	"""Remove all pathnames with a given prefix."""
  	n = len(prefix)
  	for path in cache.keys():
***************
*** 45,52 ****
  
  
- # Forget about a directory and all entries in it, but not about
- # entries in subdirectories.
- #
  def forget_dir(prefix):
  	if prefix[-1:] == '/' and prefix <> '/':
  		prefix = prefix[:-1]
--- 40,46 ----
  
  
  def forget_dir(prefix):
+ 	"""Forget about a directory and all entries in it, but not about
+ 	entries in subdirectories."""
  	if prefix[-1:] == '/' and prefix <> '/':
  		prefix = prefix[:-1]
***************
*** 63,70 ****
  
  
- # Remove all pathnames except with a given prefix.
- # Normally used with prefix = '/' after a chdir().
- #
  def forget_except_prefix(prefix):
  	n = len(prefix)
  	for path in cache.keys():
--- 57,63 ----
  
  
  def forget_except_prefix(prefix):
+ 	"""Remove all pathnames except with a given prefix.
+ 	Normally used with prefix = '/' after a chdir()."""
  	n = len(prefix)
  	for path in cache.keys():
***************
*** 73,79 ****
  
  
- # Check for directory.
- #
  def isdir(path):
  	try:
  		st = stat(path)
--- 66,71 ----
  
  
  def isdir(path):
+ 	"""Check for directory."""
  	try:
  		st = stat(path)

Index: statvfs.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/statvfs.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** statvfs.py	1999/02/10 13:12:07	1.3
--- statvfs.py	2000/02/04 15:28:41	1.4
***************
*** 1,7 ****
! # Module 'statvfs'
! #
! # Defines constants for interpreting statvfs struct as returned
! # by os.statvfs() and os.fstatvfs() (if they exist).
! #
  
  # Indices for statvfs struct members in the tuple returned by
--- 1,3 ----
! """Constants for interpreting the results of os.statvfs() and os.fstatvfs()."""
  
  # Indices for statvfs struct members in the tuple returned by

Index: string.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/string.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** string.py	1999/11/04 19:18:44	1.45
--- string.py	2000/02/04 15:28:41	1.46
***************
*** 1,10 ****
! # module 'string' -- A collection of string operations
  
! # Warning: most of the code you see here isn't normally used nowadays.  With
! # Python 1.6, many of these functions are implemented as methods on the
! # standard string object. They used to be implemented by a built-in module
! # called strop, but strop is now obsolete itself.
! 
! """Common string manipulations.
  
  Public module variables:
--- 1,8 ----
! """A collection of string operations (most are no longer used in Python 1.6).
  
! Warning: most of the code you see here isn't normally used nowadays.  With
! Python 1.6, many of these functions are implemented as methods on the
! standard string object. They used to be implemented by a built-in module
! called strop, but strop is now obsolete itself.
  
  Public module variables:

Index: sunau.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/sunau.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** sunau.py	1999/06/22 21:23:23	1.14
--- sunau.py	2000/02/04 15:28:41	1.15
***************
*** 1,105 ****
! # Stuff to parse Sun and NeXT audio files.
! #
! # An audio consists of a header followed by the data.  The structure
! # of the header is as follows.
! #
! #	+---------------+
! #	| magic word    |
! #	+---------------+
! #	| header size   |
! #	+---------------+
! #	| data size     |
! #	+---------------+
! #	| encoding      |
! #	+---------------+
! #	| sample rate   |
! #	+---------------+
! #	| # of channels |
! #	+---------------+
! #	| info          |
! #	|               |
! #	+---------------+
! #
! # The magic word consists of the 4 characters '.snd'.  Apart from the
! # info field, all header fields are 4 bytes in size.  They are all
! # 32-bit unsigned integers encoded in big-endian byte order.
! #
! # The header size really gives the start of the data.
! # The data size is the physical size of the data.  From the other
! # parameter the number of frames can be calculated.
! # The encoding gives the way in which audio samples are encoded.
! # Possible values are listed below.
! # The info field currently consists of an ASCII string giving a
! # human-readable description of the audio file.  The info field is
! # padded with NUL bytes to the header size.
! #
! # Usage.
! #
! # Reading audio files:
! #	f = sunau.open(file, 'r')
! # where file is either the name of a file or an open file pointer.
! # The open file pointer must have methods read(), seek(), and close().
! # When the setpos() and rewind() methods are not used, the seek()
! # method is not  necessary.
! #
! # This returns an instance of a class with the following public methods:
! #	getnchannels()	-- returns number of audio channels (1 for
! #			   mono, 2 for stereo)
! #	getsampwidth()	-- returns sample width in bytes
! #	getframerate()	-- returns sampling frequency
! #	getnframes()	-- returns number of audio frames
! #	getcomptype()	-- returns compression type ('NONE' or 'ULAW')
! #	getcompname()	-- returns human-readable version of
! #			   compression type ('not compressed' matches 'NONE')
! #	getparams()	-- returns a tuple consisting of all of the
! #			   above in the above order
! #	getmarkers()	-- returns None (for compatibility with the
! #			   aifc module)
! #	getmark(id)	-- raises an error since the mark does not
! #			   exist (for compatibility with the aifc module)
! #	readframes(n)	-- returns at most n frames of audio
! #	rewind()	-- rewind to the beginning of the audio stream
! #	setpos(pos)	-- seek to the specified position
! #	tell()		-- return the current position
! #	close()		-- close the instance (make it unusable)
! # The position returned by tell() and the position given to setpos()
! # are compatible and have nothing to do with the actual postion in the
! # file.
! # The close() method is called automatically when the class instance
! # is destroyed.
! #
! # Writing audio files:
! #	f = sunau.open(file, 'w')
! # where file is either the name of a file or an open file pointer.
! # The open file pointer must have methods write(), tell(), seek(), and
! # close().
! #
! # This returns an instance of a class with the following public methods:
! #	setnchannels(n)	-- set the number of channels
! #	setsampwidth(n)	-- set the sample width
! #	setframerate(n)	-- set the frame rate
! #	setnframes(n)	-- set the number of frames
! #	setcomptype(type, name)
! #			-- set the compression type and the
! #			   human-readable compression type
! #	setparams(tuple)-- set all parameters at once
! #	tell()		-- return current position in output file
! #	writeframesraw(data)
! #			-- write audio frames without pathing up the
! #			   file header
! #	writeframes(data)
! #			-- write audio frames and patch up the file header
! #	close()		-- patch up the file header and close the
! #			   output file
! # You should set the parameters before the first writeframesraw or
! # writeframes.  The total number of frames does not need to be set,
! # but when it is set to the correct value, the header does not have to
! # be patched up.
! # It is best to first set all parameters, perhaps possibly the
! # compression type, and then write audio frames using writeframesraw.
! # When all frames have been written, either call writeframes('') or
! # close() to patch up the sizes in the header.
! # The close() method is called automatically when the class instance
! # is destroyed.
  
  # from <multimedia/audio_filehdr.h>
--- 1,106 ----
! """Stuff to parse Sun and NeXT audio files.
! 
! An audio consists of a header followed by the data.  The structure
! of the header is as follows.
! 
!         +---------------+
!         | magic word    |
!         +---------------+
!         | header size   |
!         +---------------+
!         | data size     |
!         +---------------+
!         | encoding      |
!         +---------------+
!         | sample rate   |
!         +---------------+
!         | # of channels |
!         +---------------+
!         | info          |
!         |               |
!         +---------------+
! 
! The magic word consists of the 4 characters '.snd'.  Apart from the
! info field, all header fields are 4 bytes in size.  They are all
! 32-bit unsigned integers encoded in big-endian byte order.
! 
! The header size really gives the start of the data.
! The data size is the physical size of the data.  From the other
! parameter the number of frames can be calculated.
! The encoding gives the way in which audio samples are encoded.
! Possible values are listed below.
! The info field currently consists of an ASCII string giving a
! human-readable description of the audio file.  The info field is
! padded with NUL bytes to the header size.
! 
! Usage.
! 
! Reading audio files:
!         f = sunau.open(file, 'r')
! where file is either the name of a file or an open file pointer.
! The open file pointer must have methods read(), seek(), and close().
! When the setpos() and rewind() methods are not used, the seek()
! method is not  necessary.
! 
! This returns an instance of a class with the following public methods:
!         getnchannels()	-- returns number of audio channels (1 for
!         		   mono, 2 for stereo)
!         getsampwidth()	-- returns sample width in bytes
!         getframerate()	-- returns sampling frequency
!         getnframes()	-- returns number of audio frames
!         getcomptype()	-- returns compression type ('NONE' or 'ULAW')
!         getcompname()	-- returns human-readable version of
!         		   compression type ('not compressed' matches 'NONE')
!         getparams()	-- returns a tuple consisting of all of the
!         		   above in the above order
!         getmarkers()	-- returns None (for compatibility with the
!         		   aifc module)
!         getmark(id)	-- raises an error since the mark does not
!         		   exist (for compatibility with the aifc module)
!         readframes(n)	-- returns at most n frames of audio
!         rewind()	-- rewind to the beginning of the audio stream
!         setpos(pos)	-- seek to the specified position
!         tell()		-- return the current position
!         close()		-- close the instance (make it unusable)
! The position returned by tell() and the position given to setpos()
! are compatible and have nothing to do with the actual postion in the
! file.
! The close() method is called automatically when the class instance
! is destroyed.
! 
! Writing audio files:
!         f = sunau.open(file, 'w')
! where file is either the name of a file or an open file pointer.
! The open file pointer must have methods write(), tell(), seek(), and
! close().
! 
! This returns an instance of a class with the following public methods:
!         setnchannels(n)	-- set the number of channels
!         setsampwidth(n)	-- set the sample width
!         setframerate(n)	-- set the frame rate
!         setnframes(n)	-- set the number of frames
!         setcomptype(type, name)
!         		-- set the compression type and the
!         		   human-readable compression type
!         setparams(tuple)-- set all parameters at once
!         tell()		-- return current position in output file
!         writeframesraw(data)
!         		-- write audio frames without pathing up the
!         		   file header
!         writeframes(data)
!         		-- write audio frames and patch up the file header
!         close()		-- patch up the file header and close the
!         		   output file
! You should set the parameters before the first writeframesraw or
! writeframes.  The total number of frames does not need to be set,
! but when it is set to the correct value, the header does not have to
! be patched up.
! It is best to first set all parameters, perhaps possibly the
! compression type, and then write audio frames using writeframesraw.
! When all frames have been written, either call writeframes('') or
! close() to patch up the sizes in the header.
! The close() method is called automatically when the class instance
! is destroyed.
! """
  
  # from <multimedia/audio_filehdr.h>

Index: sunaudio.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/sunaudio.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** sunaudio.py	1992/06/03 16:47:49	1.3
--- sunaudio.py	2000/02/04 15:28:41	1.4
***************
*** 1,3 ****
! # Module 'sunaudio' -- interpret sun audio headers
  
  MAGIC = '.snd'
--- 1,3 ----
! """Interpret sun audio headers."""
  
  MAGIC = '.snd'
***************
*** 6,18 ****
  
  
- # convert a 4-char value to integer
- 
  def get_long_be(s):
  	return (ord(s[0])<<24) | (ord(s[1])<<16) | (ord(s[2])<<8) | ord(s[3])
  
  
- # read a sound header from an open file
- 
  def gethdr(fp):
  	if fp.read(4) <> MAGIC:
  		raise error, 'gethdr: bad magic word'
--- 6,16 ----
  
  
  def get_long_be(s):
+ 	"""Convert a 4-char value to integer."""
  	return (ord(s[0])<<24) | (ord(s[1])<<16) | (ord(s[2])<<8) | ord(s[3])
  
  
  def gethdr(fp):
+ 	"""Read a sound header from an open file."""
  	if fp.read(4) <> MAGIC:
  		raise error, 'gethdr: bad magic word'
***************
*** 32,38 ****
  
  
- # read and print the sound header of a named file
- 
  def printhdr(file):
  	hdr = gethdr(open(file, 'r'))
  	data_size, encoding, sample_rate, channels, info = hdr
--- 30,35 ----
  
  
  def printhdr(file):
+ 	"""Read and print the sound header of a named file."""
  	hdr = gethdr(open(file, 'r'))
  	data_size, encoding, sample_rate, channels, info = hdr

Index: symbol.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/symbol.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** symbol.py	1998/03/26 21:13:02	1.8
--- symbol.py	2000/02/04 15:28:41	1.9
***************
*** 1,6 ****
  #! /usr/bin/env python
! #
! #  Non-terminal symbols of Python grammar (from "graminit.h")
! #
  #  This file is automatically generated; please don't muck it up!
  #
--- 1,6 ----
  #! /usr/bin/env python
! 
! """Non-terminal symbols of Python grammar (from "graminit.h")."""
! 
  #  This file is automatically generated; please don't muck it up!
  #

Index: tempfile.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/tempfile.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** tempfile.py	1999/06/01 18:55:36	1.19
--- tempfile.py	2000/02/04 15:28:41	1.20
***************
*** 1,4 ****
! # Temporary file name allocation
! #
  # XXX This tries to be not UNIX specific, but I don't know beans about
  # how to choose a temp directory or filename on MS-DOS or other
--- 1,4 ----
! """Temporary files and filenames."""
! 
  # XXX This tries to be not UNIX specific, but I don't know beans about
  # how to choose a temp directory or filename on MS-DOS or other
***************
*** 15,21 ****
  
  
- # Function to calculate the directory to use
- 
  def gettempdir():
      global tempdir
      if tempdir is not None:
--- 15,20 ----
  
  
  def gettempdir():
+     """Function to calculate the directory to use."""
      global tempdir
      if tempdir is not None:
***************
*** 59,67 ****
  
  
- # Function to calculate a prefix of the filename to use
- 
  _pid = None
  
  def gettempprefix():
      global template, _pid
      if os.name == 'posix' and _pid and _pid != os.getpid():
--- 58,65 ----
  
  
  _pid = None
  
  def gettempprefix():
+     """Function to calculate a prefix of the filename to use."""
      global template, _pid
      if os.name == 'posix' and _pid and _pid != os.getpid():
***************
*** 86,92 ****
  
  
- # User-callable function to return a unique temporary file name
- 
  def mktemp(suffix=""):
      global counter
      dir = gettempdir()
--- 84,89 ----
  
  
  def mktemp(suffix=""):
+     """User-callable function to return a unique temporary file name."""
      global counter
      dir = gettempdir()
***************
*** 127,130 ****
--- 124,128 ----
  
  def TemporaryFile(mode='w+b', bufsize=-1, suffix=""):
+     """Create and return a temporary file (opened read-write by default)."""
      name = mktemp(suffix)
      if os.name == 'posix':

Index: threading.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/threading.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** threading.py	1999/09/29 15:26:52	1.5
--- threading.py	2000/02/04 15:28:41	1.6
***************
*** 1,4 ****
! # threading.py:
! # Proposed new threading module, emulating a subset of Java's threading model
  
  import sys
--- 1,3 ----
! """Proposed new threading module, emulating a subset of Java's threading model."""
  
  import sys

Index: toaiff.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/toaiff.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** toaiff.py	1999/02/24 18:49:15	1.4
--- toaiff.py	2000/02/04 15:28:41	1.5
***************
*** 1,9 ****
! # Convert "arbitrary" sound files to AIFF files (Apple and SGI's audio format).
! # Input may be compressed.
! # Uncompressed file type may be AIFF, WAV, VOC, 8SVX, NeXT/Sun, and others.
! # An exception is raised if the file is not of a recognized type.
! # Returned filename is either the input filename or a temporary filename;
! # in the latter case the caller must ensure that it is removed.
! # Other temporary files used are removed by the function.
  
  import os
--- 1,11 ----
! """Convert "arbitrary" sound files to AIFF (Apple and SGI's audio format).
! 
! Input may be compressed.
! Uncompressed file type may be AIFF, WAV, VOC, 8SVX, NeXT/Sun, and others.
! An exception is raised if the file is not of a recognized type.
! Returned filename is either the input filename or a temporary filename;
! in the latter case the caller must ensure that it is removed.
! Other temporary files used are removed by the function.
! """
  
  import os

Index: token.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/token.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** token.py	1998/03/26 21:13:08	1.6
--- token.py	2000/02/04 15:28:41	1.7
***************
*** 1,6 ****
  #! /usr/bin/env python
! #
! #  Tokens (from "token.h")
! #
  #  This file is automatically generated; please don't muck it up!
  #
--- 1,6 ----
  #! /usr/bin/env python
! 
! """Token constants (from "token.h")."""
! 
  #  This file is automatically generated; please don't muck it up!
  #

Index: traceback.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/traceback.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** traceback.py	1998/03/18 17:48:06	1.13
--- traceback.py	2000/02/04 15:28:41	1.14
***************
*** 1,3 ****
! # Format and print Python stack traces
  
  import linecache
--- 1,3 ----
! """Extract, format and print information about Python stack traces."""
  
  import linecache
***************
*** 11,14 ****
--- 11,16 ----
  
  def print_list(extracted_list, file=None):
+ 	"""Print the list of tuples as returned by extract_tb() or
+ 	extract_stack() as a formatted stack trace to the given file."""
  	if not file:
  		file = sys.stderr
***************
*** 20,23 ****
--- 22,31 ----
  
  def format_list(extracted_list):
+ 	"""Given a list of tuples as returned by extract_tb() or
+ 	extract_stack(), return a list of strings ready for printing.
+ 	Each string in the resulting list corresponds to the item with
+ 	the same index in the argument list.  Each string ends in a
+ 	newline; the strings may contain internal newlines as well, for
+ 	those items whose source text line is not None."""
  	list = []
  	for filename, lineno, name, line in extracted_list:
***************
*** 30,33 ****
--- 38,45 ----
  
  def print_tb(tb, limit=None, file=None):
+ 	"""Print up to 'limit' stack trace entries from the traceback 'tb'.
+ 	If 'limit' is omitted or None, all entries are printed.  If 'file' is
+ 	omitted or None, the output goes to sys.stderr; otherwise 'file'
+ 	should be an open file or file-like object with a write() method."""
  	if not file:
  		file = sys.stderr
***************
*** 50,56 ****
--- 62,77 ----
  
  def format_tb(tb, limit = None):
+ 	"""A shorthand for 'format_list(extract_stack(f, limit))."""
  	return format_list(extract_tb(tb, limit))
  
  def extract_tb(tb, limit = None):
+ 	"""Return a list of up to 'limit' pre-processed stack trace entries
+ 	extracted from the traceback object 'traceback'.  This is useful for
+ 	alternate formatting of stack traces.  If 'limit' is omitted or None,
+ 	all entries are extracted.  A pre-processed stack trace entry is a
+ 	quadruple (filename, line number, function name, text) representing
+ 	the information that is usually printed for a stack trace.  The text
+ 	is a string with leading and trailing whitespace stripped; if the
+ 	source is not available it is None."""
  	if limit is None:
  		if hasattr(sys, 'tracebacklimit'):
***************
*** 74,77 ****
--- 95,106 ----
  
  def print_exception(etype, value, tb, limit=None, file=None):
+ 	"""Print exception information and up to 'limit' stack trace entries
+ 	from the traceback 'tb' to 'file'.  This differs from print_tb() in
+ 	the following ways: (1) if traceback is not None, it prints a header
+ 	"Traceback (innermost last):"; (2) it prints the exception type and
+ 	value after the stack trace; (3) if type is SyntaxError and value has
+ 	the appropriate format, it prints the line where the syntax error
+ 	occurred with a caret on the next line indicating the approximate
+ 	position of the error."""
  	if not file:
  		file = sys.stderr
***************
*** 85,88 ****
--- 114,123 ----
  
  def format_exception(etype, value, tb, limit = None):
+ 	"""Format a stack trace and the exception information.  The arguments
+ 	have the same meaning as the corresponding arguments to
+ 	print_exception().  The return value is a list of strings, each
+ 	ending in a newline and some containing internal newlines.  When 
+ 	these lines are contatenated and printed, exactly the same text is
+ 	printed as does print_exception()."""
  	if tb:
  		list = ['Traceback (innermost last):\n']
***************
*** 94,97 ****
--- 129,140 ----
  
  def format_exception_only(etype, value):
+ 	"""Format the exception part of a traceback.  The arguments are the
+ 	exception type and value such as given by sys.last_type and
+ 	sys.last_value. The return value is a list of strings, each ending
+ 	in a newline.  Normally, the list contains a single string;
+ 	however, for SyntaxError exceptions, it contains several lines that
+ 	(when printed) display detailed information about where the syntax
+ 	error occurred.  The message indicating which exception occurred is
+ 	the always last string in the list."""
  	list = []
  	if type(etype) == types.ClassType:
***************
*** 129,132 ****
--- 172,179 ----
  
  def print_exc(limit=None, file=None):
+ 	"""This is a shorthand for 'print_exception(sys.exc_type,
+ 	sys.exc_value, sys.exc_traceback, limit, file)'.
+ 	(In fact, it uses sys.exc_info() to retrieve the same information
+ 	in a thread-safe way.)"""
  	if not file:
  		file = sys.stderr
***************
*** 138,141 ****
--- 185,190 ----
  
  def print_last(limit=None, file=None):
+ 	"""This is a shorthand for 'print_exception(sys.last_type,
+ 	sys.last_value, sys.last_traceback, limit, file)'."""
  	if not file:
  		file = sys.stderr
***************
*** 145,148 ****
--- 194,201 ----
  
  def print_stack(f=None, limit=None, file=None):
+ 	"""This function prints a stack trace from its invocation point.
+ 	The optional 'f' argument can be used to specify an alternate stack
+ 	frame at which to start. The optional 'limit' and 'file' arguments
+ 	have the same meaning as for print_exception()."""
  	if f is None:
  		try:
***************
*** 153,156 ****
--- 206,210 ----
  
  def format_stack(f=None, limit=None):
+ 	"""A shorthand for 'format_list(extract_stack(f, limit))'."""
  	if f is None:
  		try:
***************
*** 161,164 ****
--- 215,224 ----
  
  def extract_stack(f=None, limit = None):
+ 	"""Extract the raw traceback from the current stack frame.  The
+ 	return value has the same format as for extract_tb().  The optional
+ 	'f' and 'limit' arguments have the same meaning as for print_stack(). 
+ 	Each item in the list is a quadruple (filename, line number,
+ 	function name, text), and the entries are in order from outermost
+ 	to innermost stack frame."""
  	if f is None:
  		try:
***************
*** 185,195 ****
  	return list
  
- # Calculate the correct line number of the traceback given in tb (even
- # with -O on).
- # Coded by Marc-Andre Lemburg from the example of PyCode_Addr2Line()
- # in compile.c.
- # Revised version by Jim Hugunin to work with JPython too.
- 
  def tb_lineno(tb):
  	c = tb.tb_frame.f_code
  	if not hasattr(c, 'co_lnotab'):
--- 245,256 ----
  	return list
  
  def tb_lineno(tb):
+ 	"""Calculate the correct line number of the traceback given in tb
+ 	(even with -O on)."""
+ 
+ 	# Coded by Marc-Andre Lemburg from the example of PyCode_Addr2Line()
+ 	# in compile.c.
+ 	# Revised version by Jim Hugunin to work with JPython too.
+ 
  	c = tb.tb_frame.f_code
  	if not hasattr(c, 'co_lnotab'):

Index: tty.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/tty.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** tty.py	1994/09/12 10:36:34	1.1
--- tty.py	2000/02/04 15:28:41	1.2
***************
*** 1,3 ****
! # tty.py -- Terminal utilities.
  # Author: Steen Lumholt.
  
--- 1,4 ----
! """Terminal utilities."""
! 
  # Author: Steen Lumholt.
  
***************
*** 14,19 ****
  CC = 6
  
- # Put terminal into a raw mode.
  def setraw(fd, when=TCSAFLUSH):
  	mode = tcgetattr(fd)
  	mode[IFLAG] = mode[IFLAG] & ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON)
--- 15,20 ----
  CC = 6
  
  def setraw(fd, when=TCSAFLUSH):
+ 	"""Put terminal into a raw mode."""
  	mode = tcgetattr(fd)
  	mode[IFLAG] = mode[IFLAG] & ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON)
***************
*** 26,31 ****
  	tcsetattr(fd, when, mode)
  
- # Put terminal into a cbreak mode.
  def setcbreak(fd, when=TCSAFLUSH):
  	mode = tcgetattr(fd)
  	mode[LFLAG] = mode[LFLAG] & ~(ECHO | ICANON)
--- 27,32 ----
  	tcsetattr(fd, when, mode)
  
  def setcbreak(fd, when=TCSAFLUSH):
+ 	"""Put terminal into a cbreak mode."""
  	mode = tcgetattr(fd)
  	mode[LFLAG] = mode[LFLAG] & ~(ECHO | ICANON)

Index: types.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/types.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** types.py	1999/03/19 19:08:03	1.12
--- types.py	2000/02/04 15:28:41	1.13
***************
*** 1,4 ****
! # Define names for all type symbols known in the standard interpreter.
! # Types that are part of optional modules (e.g. array) are not listed.
  
  import sys
--- 1,6 ----
! """Define names for all type symbols known in the standard interpreter.
! 
! Types that are part of optional modules (e.g. array) are not listed.
! """
  
  import sys

Index: tzparse.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/tzparse.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** tzparse.py	1997/10/22 20:58:20	1.6
--- tzparse.py	2000/02/04 15:28:41	1.7
***************
*** 1,3 ****
! # Parse a timezone specification.
  # XXX Unfinished.
  # XXX Only the typical form "XXXhhYYY;ddd/hh,ddd/hh" is currently supported.
--- 1,4 ----
! """Parse a timezone specification."""
! 
  # XXX Unfinished.
  # XXX Only the typical form "XXXhhYYY;ddd/hh,ddd/hh" is currently supported.
***************
*** 9,12 ****
--- 10,19 ----
  
  def tzparse(tzstr):
+ 	"""Given a timezone spec, return a tuple of information
+ 	(tzname, delta, dstname, daystart, hourstart, dayend, hourend),
+ 	where 'tzname' is the name of the timezone, 'delta' is the offset
+ 	in hours from GMT, 'dstname' is the name of the daylight-saving
+ 	timezone, and 'daystart'/'hourstart' and 'dayend'/'hourend'
+ 	specify the starting and ending points for daylight saving time."""
  	global tzprog
  	if tzprog == None:
***************
*** 25,28 ****
--- 32,38 ----
  
  def tzlocaltime(secs, params):
+ 	"""Given a Unix time in seconds and a tuple of information about
+ 	a timezone as returned by tzparse(), return the local time in the
+ 	form (year, month, day, hour, min, sec, yday, wday, tzname)."""
  	import time
  	(tzname, delta, dstname, daystart, hourstart, dayend, hourend) = params
***************
*** 35,38 ****
--- 45,49 ----
  
  def tzset():
+ 	"""Determine the current timezone from the "TZ" environment variable."""
  	global tzparams, timezone, altzone, daylight, tzname
  	import os
***************
*** 45,48 ****
--- 56,61 ----
  
  def isdst(secs):
+ 	"""Return true if daylight-saving time is in effect for the given
+ 	Unix time in the current timezone."""
  	import time
  	(tzname, delta, dstname, daystart, hourstart, dayend, hourend) = \
***************
*** 55,58 ****
--- 68,72 ----
  
  def localtime(secs):
+ 	"""Get the local time in the current timezone."""
  	return tzlocaltime(secs, tzparams)
  

Index: urllib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/urllib.py,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -r1.90 -r1.91
*** urllib.py	2000/02/01 23:36:55	1.90
--- urllib.py	2000/02/04 15:28:41	1.91
***************
*** 1,25 ****
! # Open an arbitrary URL
! #
! # See the following document for more info on URLs:
! # "Names and Addresses, URIs, URLs, URNs, URCs", at
! # http://www.w3.org/pub/WWW/Addressing/Overview.html
! #
! # See also the HTTP spec (from which the error codes are derived):
! # "HTTP - Hypertext Transfer Protocol", at
! # http://www.w3.org/pub/WWW/Protocols/
! #
! # Related standards and specs:
! # - RFC1808: the "relative URL" spec. (authoritative status)
! # - RFC1738 - the "URL standard". (authoritative status)
! # - RFC1630 - the "URI spec". (informational status)
! #
! # The object returned by URLopener().open(file) will differ per
! # protocol.  All you know is that is has methods read(), readline(),
! # readlines(), fileno(), close() and info().  The read*(), fileno()
! # and close() methods work like those of open files. 
! # The info() method returns a mimetools.Message object which can be
! # used to query various info about the object, if available.
! # (mimetools.Message objects are queried with the getheader() method.)
  
  import string
  import socket
--- 1,26 ----
! """Open an arbitrary URL.
  
+ See the following document for more info on URLs:
+ "Names and Addresses, URIs, URLs, URNs, URCs", at
+ http://www.w3.org/pub/WWW/Addressing/Overview.html
+ 
+ See also the HTTP spec (from which the error codes are derived):
+ "HTTP - Hypertext Transfer Protocol", at
+ http://www.w3.org/pub/WWW/Protocols/
+ 
+ Related standards and specs:
+ - RFC1808: the "relative URL" spec. (authoritative status)
+ - RFC1738 - the "URL standard". (authoritative status)
+ - RFC1630 - the "URI spec". (informational status)
+ 
+ The object returned by URLopener().open(file) will differ per
+ protocol.  All you know is that is has methods read(), readline(),
+ readlines(), fileno(), close() and info().  The read*(), fileno()
+ and close() methods work like those of open files. 
+ The info() method returns a mimetools.Message object which can be
+ used to query various info about the object, if available.
+ (mimetools.Message objects are queried with the getheader() method.)
+ """
+ 
  import string
  import socket
***************
*** 70,81 ****
  
  
- # Class to open URLs.
- # This is a class rather than just a subroutine because we may need
- # more than one set of global protocol-specific options.
- # Note -- this is a base class for those who don't want the
- # automatic handling of errors type 302 (relocated) and 401
- # (authorization needed).
  ftpcache = {}
  class URLopener:
  
      __tempfiles = None
--- 71,82 ----
  
  
  ftpcache = {}
  class URLopener:
+     """Class to open URLs.
+     This is a class rather than just a subroutine because we may need
+     more than one set of global protocol-specific options.
+     Note -- this is a base class for those who don't want the
+     automatic handling of errors type 302 (relocated) and 401
+     (authorization needed)."""
  
      __tempfiles = None
***************
*** 126,137 ****
              self.tempcache.clear()
  
-     # Add a header to be used by the HTTP interface only
-     # e.g. u.addheader('Accept', 'sound/basic')
      def addheader(self, *args):
          self.addheaders.append(args)
  
      # External interface
-     # Use URLopener().open(file) instead of open(file, 'r')
      def open(self, fullurl, data=None):
          fullurl = unwrap(fullurl)
          if self.tempcache and self.tempcache.has_key(fullurl):
--- 127,138 ----
              self.tempcache.clear()
  
      def addheader(self, *args):
+         """Add a header to be used by the HTTP interface only
+         e.g. u.addheader('Accept', 'sound/basic')"""
          self.addheaders.append(args)
  
      # External interface
      def open(self, fullurl, data=None):
+         """Use URLopener().open(file) instead of open(file, 'r')."""
          fullurl = unwrap(fullurl)
          if self.tempcache and self.tempcache.has_key(fullurl):
***************
*** 164,176 ****
              raise IOError, ('socket error', msg), sys.exc_info()[2]
  
-     # Overridable interface to open unknown URL type
      def open_unknown(self, fullurl, data=None):
          type, url = splittype(fullurl)
          raise IOError, ('url error', 'unknown url type', type)
  
      # External interface
-     # retrieve(url) returns (filename, None) for a local object
-     # or (tempfilename, headers) for a remote object
      def retrieve(self, url, filename=None, reporthook=None):
          url = unwrap(url)
          if self.tempcache and self.tempcache.has_key(url):
--- 165,177 ----
              raise IOError, ('socket error', msg), sys.exc_info()[2]
  
      def open_unknown(self, fullurl, data=None):
+         """Overridable interface to open unknown URL type."""
          type, url = splittype(fullurl)
          raise IOError, ('url error', 'unknown url type', type)
  
      # External interface
      def retrieve(self, url, filename=None, reporthook=None):
+         """retrieve(url) returns (filename, None) for a local object
+         or (tempfilename, headers) for a remote object."""
          url = unwrap(url)
          if self.tempcache and self.tempcache.has_key(url):
***************
*** 224,229 ****
      # Each method named open_<type> knows how to open that type of URL
  
-     # Use HTTP protocol
      def open_http(self, url, data=None):
          import httplib
          user_passwd = None
--- 225,230 ----
      # Each method named open_<type> knows how to open that type of URL
  
      def open_http(self, url, data=None):
+         """Use HTTP protocol."""
          import httplib
          user_passwd = None
***************
*** 277,284 ****
                  return self.http_error(url, fp, errcode, errmsg, headers, data)
  
-     # Handle http errors.
-     # Derived class can override this, or provide specific handlers
-     # named http_error_DDD where DDD is the 3-digit error code
      def http_error(self, url, fp, errcode, errmsg, headers, data=None):
          # First check if there's a specific handler for this error
          name = 'http_error_%d' % errcode
--- 278,285 ----
                  return self.http_error(url, fp, errcode, errmsg, headers, data)
  
      def http_error(self, url, fp, errcode, errmsg, headers, data=None):
+         """Handle http errors.
+         Derived class can override this, or provide specific handlers
+         named http_error_DDD where DDD is the 3-digit error code."""
          # First check if there's a specific handler for this error
          name = 'http_error_%d' % errcode
***************
*** 292,304 ****
          return self.http_error_default(url, fp, errcode, errmsg, headers)
  
-     # Default http error handler: close the connection and raises IOError
      def http_error_default(self, url, fp, errcode, errmsg, headers):
          void = fp.read()
          fp.close()
          raise IOError, ('http error', errcode, errmsg, headers)
  
-     # Use HTTPS protocol
      if hasattr(socket, "ssl"):
          def open_https(self, url):
              import httplib
              if type(url) is type(""):
--- 293,305 ----
          return self.http_error_default(url, fp, errcode, errmsg, headers)
  
      def http_error_default(self, url, fp, errcode, errmsg, headers):
+         """Default error handler: close the connection and raise IOError."""
          void = fp.read()
          fp.close()
          raise IOError, ('http error', errcode, errmsg, headers)
  
      if hasattr(socket, "ssl"):
          def open_https(self, url):
+             """Use HTTPS protocol."""
              import httplib
              if type(url) is type(""):
***************
*** 334,339 ****
                  return self.http_error(url, fp, errcode, errmsg, headers)
    
-     # Use Gopher protocol
      def open_gopher(self, url):
          import gopherlib
          host, selector = splithost(url)
--- 335,340 ----
                  return self.http_error(url, fp, errcode, errmsg, headers)
    
      def open_gopher(self, url):
+         """Use Gopher protocol."""
          import gopherlib
          host, selector = splithost(url)
***************
*** 350,355 ****
          return addinfourl(fp, noheaders(), "gopher:" + url)
  
-     # Use local file or FTP depending on form of URL
      def open_file(self, url):
          if url[:2] == '//' and url[2:3] != '/':
              return self.open_ftp(url)
--- 351,356 ----
          return addinfourl(fp, noheaders(), "gopher:" + url)
  
      def open_file(self, url):
+         """Use local file or FTP depending on form of URL."""
          if url[:2] == '//' and url[2:3] != '/':
              return self.open_ftp(url)
***************
*** 357,362 ****
              return self.open_local_file(url)
  
-     # Use local file
      def open_local_file(self, url):
          import mimetypes, mimetools, StringIO
          mtype = mimetypes.guess_type(url)[0]
--- 358,363 ----
              return self.open_local_file(url)
  
      def open_local_file(self, url):
+         """Use local file."""
          import mimetypes, mimetools, StringIO
          mtype = mimetypes.guess_type(url)[0]
***************
*** 380,385 ****
          raise IOError, ('local file error', 'not on local host')
  
-     # Use FTP protocol
      def open_ftp(self, url):
          host, path = splithost(url)
          if not host: raise IOError, ('ftp error', 'no host given')
--- 381,386 ----
          raise IOError, ('local file error', 'not on local host')
  
      def open_ftp(self, url):
+         """Use FTP protocol."""
          host, path = splithost(url)
          if not host: raise IOError, ('ftp error', 'no host given')
***************
*** 434,439 ****
              raise IOError, ('ftp error', msg), sys.exc_info()[2]
  
-     # Use "data" URL
      def open_data(self, url, data=None):
          # ignore POSTed data
          #
--- 435,440 ----
              raise IOError, ('ftp error', msg), sys.exc_info()[2]
  
      def open_data(self, url, data=None):
+         """Use "data" URL."""
          # ignore POSTed data
          #
***************
*** 475,480 ****
  
  
- # Derived class with handlers for errors we can handle (perhaps)
  class FancyURLopener(URLopener):
  
      def __init__(self, *args):
--- 476,481 ----
  
  
  class FancyURLopener(URLopener):
+     """Derived class with handlers for errors we can handle (perhaps)."""
  
      def __init__(self, *args):
***************
*** 482,492 ****
          self.auth_cache = {}
  
-     # Default error handling -- don't raise an exception
      def http_error_default(self, url, fp, errcode, errmsg, headers):
          return addinfourl(fp, headers, "http:" + url)
  
!     # Error 302 -- relocated (temporarily)
!     def http_error_302(self, url, fp, errcode, errmsg, headers,
!                data=None): 
          # XXX The server can force infinite recursion here!
          if headers.has_key('location'):
--- 483,492 ----
          self.auth_cache = {}
  
      def http_error_default(self, url, fp, errcode, errmsg, headers):
+         """Default error handling -- don't raise an exception."""
          return addinfourl(fp, headers, "http:" + url)
  
!     def http_error_302(self, url, fp, errcode, errmsg, headers, data=None): 
!         """Error 302 -- relocated (temporarily)."""
          # XXX The server can force infinite recursion here!
          if headers.has_key('location'):
***************
*** 504,516 ****
          else:
              return self.open(newurl, data)
- 
-     # Error 301 -- also relocated (permanently)
-     http_error_301 = http_error_302
  
!     # Error 401 -- authentication required
!     # See this URL for a description of the basic authentication scheme:
!     # http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-v10-spec-00.txt
!     def http_error_401(self, url, fp, errcode, errmsg, headers,
!                data=None): 
          if headers.has_key('www-authenticate'):
              stuff = headers['www-authenticate']
--- 504,516 ----
          else:
              return self.open(newurl, data)
  
!     def http_error_301(self, url, fp, errcode, errmsg, headers, data=None): 
!         """Error 301 -- also relocated (permanently)."""
!         return self.http_error_302(url, fp, errcode, errmsg, headers, data)
! 
!     def http_error_401(self, url, fp, errcode, errmsg, headers, data=None): 
!         """Error 401 -- authentication required.
!         See this URL for a description of the basic authentication scheme:
!         http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-v10-spec-00.txt"""
          if headers.has_key('www-authenticate'):
              stuff = headers['www-authenticate']
***************
*** 561,565 ****
  
      def prompt_user_passwd(self, host, realm):
!         # Override this in a GUI environment!
          import getpass
          try:
--- 561,565 ----
  
      def prompt_user_passwd(self, host, realm):
!         """Override this in a GUI environment!"""
          import getpass
          try:
***************
*** 576,582 ****
  # Utility functions
  
- # Return the IP address of the magic hostname 'localhost'
  _localhost = None
  def localhost():
      global _localhost
      if not _localhost:
--- 576,582 ----
  # Utility functions
  
  _localhost = None
  def localhost():
+     """Return the IP address of the magic hostname 'localhost'."""
      global _localhost
      if not _localhost:
***************
*** 584,590 ****
      return _localhost
  
- # Return the IP address of the current host
  _thishost = None
  def thishost():
      global _thishost
      if not _thishost:
--- 584,590 ----
      return _localhost
  
  _thishost = None
  def thishost():
+     """Return the IP address of the current host."""
      global _thishost
      if not _thishost:
***************
*** 592,598 ****
      return _thishost
  
- # Return the set of errors raised by the FTP class
  _ftperrors = None
  def ftperrors():
      global _ftperrors
      if not _ftperrors:
--- 592,598 ----
      return _thishost
  
  _ftperrors = None
  def ftperrors():
+     """Return the set of errors raised by the FTP class."""
      global _ftperrors
      if not _ftperrors:
***************
*** 601,607 ****
      return _ftperrors
  
- # Return an empty mimetools.Message object
  _noheaders = None
  def noheaders():
      global _noheaders
      if not _noheaders:
--- 601,607 ----
      return _ftperrors
  
  _noheaders = None
  def noheaders():
+     """Return an empty mimetools.Message object."""
      global _noheaders
      if not _noheaders:
***************
*** 615,620 ****
  # Utility classes
  
- # Class used by open_ftp() for cache of open FTP connections
  class ftpwrapper:
      def __init__(self, user, passwd, host, port, dirs):
          self.user = user
--- 615,621 ----
  # Utility classes
  
  class ftpwrapper:
+     """Class used by open_ftp() for cache of open FTP connections."""
+ 
      def __init__(self, user, passwd, host, port, dirs):
          self.user = user
***************
*** 624,627 ****
--- 625,629 ----
          self.dirs = dirs
          self.init()
+ 
      def init(self):
          import ftplib
***************
*** 632,635 ****
--- 634,638 ----
          for dir in self.dirs:
              self.ftp.cwd(dir)
+ 
      def retrfile(self, file, type):
          import ftplib
***************
*** 677,680 ****
--- 680,684 ----
          except ftperrors():
              pass
+ 
      def close(self):
          self.endtransfer()
***************
*** 684,689 ****
              pass
  
- # Base class for addinfo and addclosehook
  class addbase:
      def __init__(self, fp):
          self.fp = fp
--- 688,694 ----
              pass
  
  class addbase:
+     """Base class for addinfo and addclosehook."""
+ 
      def __init__(self, fp):
          self.fp = fp
***************
*** 692,698 ****
--- 697,705 ----
          if hasattr(self.fp, "readlines"): self.readlines = self.fp.readlines
          if hasattr(self.fp, "fileno"): self.fileno = self.fp.fileno
+ 
      def __repr__(self):
          return '<%s at %s whose fp = %s>' % (self.__class__.__name__,
                                               `id(self)`, `self.fp`) 
+ 
      def close(self):
          self.read = None
***************
*** 703,712 ****
          self.fp = None
  
- # Class to add a close hook to an open file
  class addclosehook(addbase):
      def __init__(self, fp, closehook, *hookargs):
          addbase.__init__(self, fp)
          self.closehook = closehook
          self.hookargs = hookargs
      def close(self):
          if self.closehook:
--- 710,721 ----
          self.fp = None
  
  class addclosehook(addbase):
+     """Class to add a close hook to an open file."""
+ 
      def __init__(self, fp, closehook, *hookargs):
          addbase.__init__(self, fp)
          self.closehook = closehook
          self.hookargs = hookargs
+ 
      def close(self):
          if self.closehook:
***************
*** 716,742 ****
          addbase.close(self)
  
- # class to add an info() method to an open file
  class addinfo(addbase):
      def __init__(self, fp, headers):
          addbase.__init__(self, fp)
          self.headers = headers
      def info(self):
          return self.headers
  
- # class to add info() and geturl() methods to an open file
  class addinfourl(addbase):
      def __init__(self, fp, headers, url):
          addbase.__init__(self, fp)
          self.headers = headers
          self.url = url
      def info(self):
          return self.headers
      def geturl(self):
          return self.url
  
  
- # Utility to combine a URL with a base URL to form a new URL
- 
  def basejoin(base, url):
      type, path = splittype(url)
      if type:
--- 725,755 ----
          addbase.close(self)
  
  class addinfo(addbase):
+     """class to add an info() method to an open file."""
+ 
      def __init__(self, fp, headers):
          addbase.__init__(self, fp)
          self.headers = headers
+ 
      def info(self):
          return self.headers
  
  class addinfourl(addbase):
+     """class to add info() and geturl() methods to an open file."""
+ 
      def __init__(self, fp, headers, url):
          addbase.__init__(self, fp)
          self.headers = headers
          self.url = url
+ 
      def info(self):
          return self.headers
+ 
      def geturl(self):
          return self.url
  
  
  def basejoin(base, url):
+     """Utility to combine a URL with a base URL to form a new URL."""
      type, path = splittype(url)
      if type:
***************
*** 810,813 ****
--- 823,827 ----
  
  def unwrap(url):
+     """unwrap('<URL:type://host/path>') --> 'type://host/path'."""
      url = string.strip(url)
      if url[:1] == '<' and url[-1:] == '>':
***************
*** 818,821 ****
--- 832,836 ----
  _typeprog = None
  def splittype(url):
+     """splittype('type:opaquestring') --> 'type', 'opaquestring'."""
      global _typeprog
      if _typeprog is None:
***************
*** 831,834 ****
--- 846,850 ----
  _hostprog = None
  def splithost(url):
+     """splithost('//host[:port]/path') --> 'host[:port]', '/path'."""
      global _hostprog
      if _hostprog is None:
***************
*** 842,845 ****
--- 858,862 ----
  _userprog = None
  def splituser(host):
+     """splituser('user[:passwd]@host[:port]') --> 'user[:passwd]', 'host[:port]'."""
      global _userprog
      if _userprog is None:
***************
*** 853,856 ****
--- 870,874 ----
  _passwdprog = None
  def splitpasswd(user):
+     """splitpasswd('user:passwd') -> 'user', 'passwd'."""
      global _passwdprog
      if _passwdprog is None:
***************
*** 862,867 ****
--- 880,887 ----
      return user, None
  
+ # splittag('/path#tag') --> '/path', 'tag'
  _portprog = None
  def splitport(host):
+     """splitport('host:port') --> 'host', 'port'."""
      global _portprog
      if _portprog is None:
***************
*** 873,882 ****
      return host, None
  
- # Split host and port, returning numeric port.
- # Return given default port if no ':' found; defaults to -1.
- # Return numerical port if a valid number are found after ':'.
- # Return None if ':' but not a valid number.
  _nportprog = None
  def splitnport(host, defport=-1):
      global _nportprog
      if _nportprog is None:
--- 893,902 ----
      return host, None
  
  _nportprog = None
  def splitnport(host, defport=-1):
+     """Split host and port, returning numeric port.
+     Return given default port if no ':' found; defaults to -1.
+     Return numerical port if a valid number are found after ':'.
+     Return None if ':' but not a valid number."""
      global _nportprog
      if _nportprog is None:
***************
*** 897,900 ****
--- 917,921 ----
  _queryprog = None
  def splitquery(url):
+     """splitquery('/path?query') --> '/path', 'query'."""
      global _queryprog
      if _queryprog is None:
***************
*** 908,911 ****
--- 929,933 ----
  _tagprog = None
  def splittag(url):
+     """splittag('/path#tag') --> '/path', 'tag'."""
      global _tagprog
      if _tagprog is None:
***************
*** 918,921 ****
--- 940,945 ----
  
  def splitattr(url):
+     """splitattr('/path;attr1=value1;attr2=value2;...') ->
+         '/path', ['attr1=value1', 'attr2=value2', ...]."""
      words = string.splitfields(url, ';')
      return words[0], words[1:]
***************
*** 923,926 ****
--- 947,951 ----
  _valueprog = None
  def splitvalue(attr):
+     """splitvalue('attr=value') --> 'attr', 'value'."""
      global _valueprog
      if _valueprog is None:
***************
*** 933,936 ****
--- 958,962 ----
  
  def splitgophertype(selector):
+     """splitgophertype('/Xselector') --> 'X', 'selector'."""
      if selector[:1] == '/' and selector[1:2]:
          return selector[1], selector[2:]
***************
*** 938,941 ****
--- 964,968 ----
  
  def unquote(s):
+     """unquote('abc%20def') -> 'abc def'."""
      mychr = chr
      myatoi = string.atoi
***************
*** 963,966 ****
--- 990,994 ----
  always_safe = string.letters + string.digits + '_,.-'
  def quote(s, safe = '/'):
+     """quote('abc def') -> 'abc%20def')."""
      # XXX Can speed this up an order of magnitude
      safe = always_safe + safe
***************
*** 984,993 ****
  
  def urlencode(dict):
!      l = []
!      for k, v in dict.items():
!          k = quote_plus(str(k))
!          v = quote_plus(str(v))
!          l.append(k + '=' + v)
!      return string.join(l, '&')
  
  
--- 1012,1022 ----
  
  def urlencode(dict):
!     """Encode a dictionary of form entries into a URL query string."""
!     l = []
!     for k, v in dict.items():
!         k = quote_plus(str(k))
!         v = quote_plus(str(v))
!         l.append(k + '=' + v)
!     return string.join(l, '&')
  
  

Index: urllib2.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/urllib2.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** urllib2.py	2000/01/20 18:19:08	1.1
--- urllib2.py	2000/02/04 15:28:42	1.2
***************
*** 1,3 ****
! """An extensible library for opening URLs using a variety protocols
  
  The simplest way to use this module is to call the urlopen function,
--- 1,3 ----
! """An extensible library for opening URLs using a variety of protocols
  
  The simplest way to use this module is to call the urlopen function,

Index: urlparse.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/urlparse.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** urlparse.py	1999/05/03 18:16:23	1.21
--- urlparse.py	2000/02/04 15:28:42	1.22
***************
*** 1,5 ****
! # Parse (absolute and relative) URLs.  See RFC 1808: "Relative Uniform
! # Resource Locators", by R. Fielding, UC Irvine, June 1995.
  
  # Standard/builtin Python modules
  import string
--- 1,8 ----
! """Parse (absolute and relative) URLs.
  
+ See RFC 1808: "Relative Uniform Resource Locators", by R. Fielding,
+ UC Irvine, June 1995.
+ """
+ 
  # Standard/builtin Python modules
  import string
***************
*** 40,49 ****
  
  
- # Parse a URL into 6 components:
- # <scheme>://<netloc>/<path>;<params>?<query>#<fragment>
- # Return a 6-tuple: (scheme, netloc, path, params, query, fragment).
- # Note that we don't break the components up in smaller bits
- # (e.g. netloc is a single string) and we don't expand % escapes.
  def urlparse(url, scheme = '', allow_fragments = 1):
  	key = url, scheme, allow_fragments
  	cached = _parse_cache.get(key, None)
--- 43,52 ----
  
  
  def urlparse(url, scheme = '', allow_fragments = 1):
+ 	"""Parse a URL into 6 components:
+ 	<scheme>://<netloc>/<path>;<params>?<query>#<fragment>
+ 	Return a 6-tuple: (scheme, netloc, path, params, query, fragment).
+ 	Note that we don't break the components up in smaller bits
+ 	(e.g. netloc is a single string) and we don't expand % escapes."""
  	key = url, scheme, allow_fragments
  	cached = _parse_cache.get(key, None)
***************
*** 108,116 ****
  	return tuple
  
- # Put a parsed URL back together again.  This may result in a slightly
- # different, but equivalent URL, if the URL that was parsed originally
- # had redundant delimiters, e.g. a ? with an empty query (the draft
- # states that these are equivalent).
  def urlunparse((scheme, netloc, url, params, query, fragment)):
  	if netloc or (scheme in uses_netloc and url[:2] == '//'):
  		if url[:1] != '/': url = '/' + url
--- 111,119 ----
  	return tuple
  
  def urlunparse((scheme, netloc, url, params, query, fragment)):
+ 	"""Put a parsed URL back together again.  This may result in a
+ 	slightly different, but equivalent URL, if the URL that was parsed
+ 	originally had redundant delimiters, e.g. a ? with an empty query
+ 	(the draft states that these are equivalent)."""
  	if netloc or (scheme in uses_netloc and url[:2] == '//'):
  		if url[:1] != '/': url = '/' + url
***************
*** 126,132 ****
  	return url
  
- # Join a base URL and a possibly relative URL to form an absolute
- # interpretation of the latter.
  def urljoin(base, url, allow_fragments = 1):
  	if not base:
  		return url
--- 129,135 ----
  	return url
  
  def urljoin(base, url, allow_fragments = 1):
+ 	"""Join a base URL and a possibly relative URL to form an absolute
+ 	interpretation of the latter."""
  	if not base:
  		return url

Index: uu.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/uu.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** uu.py	1999/01/05 18:02:24	1.10
--- uu.py	2000/02/04 15:28:42	1.11
***************
*** 24,32 ****
  #   version is still 5 times faster, though.
  # - Arguments more compliant with python standard
- #
- # This file implements the UUencode and UUdecode functions.
  
! # encode(in_file, out_file [,name, mode])
! # decode(in_file [, out_file, mode])
  
  import binascii
--- 24,33 ----
  #   version is still 5 times faster, though.
  # - Arguments more compliant with python standard
  
! """Implementation of the UUencode and UUdecode functions.
! 
! encode(in_file, out_file [,name, mode])
! decode(in_file [, out_file, mode])
! """
  
  import binascii

Index: wave.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/wave.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** wave.py	1999/08/26 15:50:43	1.8
--- wave.py	2000/02/04 15:28:42	1.9
***************
*** 1,74 ****
! # Stuff to parse WAVE files.
! #
! # Usage.
! #
! # Reading WAVE files:
! #	f = wave.open(file, 'r')
! # where file is either the name of a file or an open file pointer.
! # The open file pointer must have methods read(), seek(), and close().
! # When the setpos() and rewind() methods are not used, the seek()
! # method is not  necessary.
! #
! # This returns an instance of a class with the following public methods:
! #	getnchannels()	-- returns number of audio channels (1 for
! #			   mono, 2 for stereo)
! #	getsampwidth()	-- returns sample width in bytes
! #	getframerate()	-- returns sampling frequency
! #	getnframes()	-- returns number of audio frames
! #	getcomptype()	-- returns compression type ('NONE' for linear samples)
! #	getcompname()	-- returns human-readable version of
! #			   compression type ('not compressed' linear samples)
! #	getparams()	-- returns a tuple consisting of all of the
! #			   above in the above order
! #	getmarkers()	-- returns None (for compatibility with the
! #			   aifc module)
! #	getmark(id)	-- raises an error since the mark does not
! #			   exist (for compatibility with the aifc module)
! #	readframes(n)	-- returns at most n frames of audio
! #	rewind()	-- rewind to the beginning of the audio stream
! #	setpos(pos)	-- seek to the specified position
! #	tell()		-- return the current position
! #	close()		-- close the instance (make it unusable)
! # The position returned by tell() and the position given to setpos()
! # are compatible and have nothing to do with the actual postion in the
! # file.
! # The close() method is called automatically when the class instance
! # is destroyed.
! #
! # Writing WAVE files:
! #	f = wave.open(file, 'w')
! # where file is either the name of a file or an open file pointer.
! # The open file pointer must have methods write(), tell(), seek(), and
! # close().
! #
! # This returns an instance of a class with the following public methods:
! #	setnchannels(n)	-- set the number of channels
! #	setsampwidth(n)	-- set the sample width
! #	setframerate(n)	-- set the frame rate
! #	setnframes(n)	-- set the number of frames
! #	setcomptype(type, name)
! #			-- set the compression type and the
! #			   human-readable compression type
! #	setparams(tuple)
! #			-- set all parameters at once
! #	tell()		-- return current position in output file
! #	writeframesraw(data)
! #			-- write audio frames without pathing up the
! #			   file header
! #	writeframes(data)
! #			-- write audio frames and patch up the file header
! #	close()		-- patch up the file header and close the
! #			   output file
! # You should set the parameters before the first writeframesraw or
! # writeframes.  The total number of frames does not need to be set,
! # but when it is set to the correct value, the header does not have to
! # be patched up.
! # It is best to first set all parameters, perhaps possibly the
! # compression type, and then write audio frames using writeframesraw.
! # When all frames have been written, either call writeframes('') or
! # close() to patch up the sizes in the header.
! # The close() method is called automatically when the class instance
! # is destroyed.
  
  import __builtin__
  
--- 1,75 ----
! """Stuff to parse WAVE files.
  
+ Usage.
+ 
+ Reading WAVE files:
+       f = wave.open(file, 'r')
+ where file is either the name of a file or an open file pointer.
+ The open file pointer must have methods read(), seek(), and close().
+ When the setpos() and rewind() methods are not used, the seek()
+ method is not  necessary.
+ 
+ This returns an instance of a class with the following public methods:
+       getnchannels()  -- returns number of audio channels (1 for
+                          mono, 2 for stereo)
+       getsampwidth()  -- returns sample width in bytes
+       getframerate()  -- returns sampling frequency
+       getnframes()    -- returns number of audio frames
+       getcomptype()   -- returns compression type ('NONE' for linear samples)
+       getcompname()   -- returns human-readable version of
+                          compression type ('not compressed' linear samples)
+       getparams()     -- returns a tuple consisting of all of the
+                          above in the above order
+       getmarkers()    -- returns None (for compatibility with the
+                          aifc module)
+       getmark(id)     -- raises an error since the mark does not
+                          exist (for compatibility with the aifc module)
+       readframes(n)   -- returns at most n frames of audio
+       rewind()        -- rewind to the beginning of the audio stream
+       setpos(pos)     -- seek to the specified position
+       tell()          -- return the current position
+       close()         -- close the instance (make it unusable)
+ The position returned by tell() and the position given to setpos()
+ are compatible and have nothing to do with the actual postion in the
+ file.
+ The close() method is called automatically when the class instance
+ is destroyed.
+ 
+ Writing WAVE files:
+       f = wave.open(file, 'w')
+ where file is either the name of a file or an open file pointer.
+ The open file pointer must have methods write(), tell(), seek(), and
+ close().
+ 
+ This returns an instance of a class with the following public methods:
+       setnchannels(n) -- set the number of channels
+       setsampwidth(n) -- set the sample width
+       setframerate(n) -- set the frame rate
+       setnframes(n)   -- set the number of frames
+       setcomptype(type, name)
+                       -- set the compression type and the
+                          human-readable compression type
+       setparams(tuple)
+                       -- set all parameters at once
+       tell()          -- return current position in output file
+       writeframesraw(data)
+                       -- write audio frames without pathing up the
+                          file header
+       writeframes(data)
+                       -- write audio frames and patch up the file header
+       close()         -- patch up the file header and close the
+                          output file
+ You should set the parameters before the first writeframesraw or
+ writeframes.  The total number of frames does not need to be set,
+ but when it is set to the correct value, the header does not have to
+ be patched up.
+ It is best to first set all parameters, perhaps possibly the
+ compression type, and then write audio frames using writeframesraw.
+ When all frames have been written, either call writeframes('') or
+ close() to patch up the sizes in the header.
+ The close() method is called automatically when the class instance
+ is destroyed.
+ """
+ 
  import __builtin__
  
***************
*** 82,471 ****
  import struct
  if struct.pack("h", 1) == "\000\001":
! 	big_endian = 1
  else:
! 	big_endian = 0
  
  from chunk import Chunk
  
  class Wave_read:
! 	# Variables used in this class:
! 	#
! 	# These variables are available to the user though appropriate
! 	# methods of this class:
! 	# _file -- the open file with methods read(), close(), and seek()
! 	#		set through the __init__() method
! 	# _nchannels -- the number of audio channels
! 	#		available through the getnchannels() method
! 	# _nframes -- the number of audio frames
! 	#		available through the getnframes() method
! 	# _sampwidth -- the number of bytes per audio sample
! 	#		available through the getsampwidth() method
! 	# _framerate -- the sampling frequency
! 	#		available through the getframerate() method
! 	# _comptype -- the AIFF-C compression type ('NONE' if AIFF)
! 	#		available through the getcomptype() method
! 	# _compname -- the human-readable AIFF-C compression type
! 	#		available through the getcomptype() method
! 	# _soundpos -- the position in the audio stream
! 	#		available through the tell() method, set through the
! 	#		setpos() method
! 	#
! 	# These variables are used internally only:
! 	# _fmt_chunk_read -- 1 iff the FMT chunk has been read
! 	# _data_seek_needed -- 1 iff positioned correctly in audio
! 	#		file for readframes()
! 	# _data_chunk -- instantiation of a chunk class for the DATA chunk
! 	# _framesize -- size of one frame in the file
! 
! 	def initfp(self, file):
! 		self._convert = None
! 		self._soundpos = 0
! 		self._file = Chunk(file, bigendian = 0)
! 		if self._file.getname() != 'RIFF':
! 			raise Error, 'file does not start with RIFF id'
! 		if self._file.read(4) != 'WAVE':
! 			raise Error, 'not a WAVE file'
! 		self._fmt_chunk_read = 0
! 		self._data_chunk = None
! 		while 1:
! 			self._data_seek_needed = 1
! 			try:
! 				chunk = Chunk(self._file, bigendian = 0)
! 			except EOFError:
! 				break
! 			chunkname = chunk.getname()
! 			if chunkname == 'fmt ':
! 				self._read_fmt_chunk(chunk)
! 				self._fmt_chunk_read = 1
! 			elif chunkname == 'data':
! 				if not self._fmt_chunk_read:
! 					raise Error, 'data chunk before fmt chunk'
! 				self._data_chunk = chunk
! 				self._nframes = chunk.chunksize / self._framesize
! 				self._data_seek_needed = 0
! 				break
! 			chunk.skip()
! 		if not self._fmt_chunk_read or not self._data_chunk:
! 			raise Error, 'fmt chunk and/or data chunk missing'
! 
! 	def __init__(self, f):
! 		if type(f) == type(''):
! 			f = __builtin__.open(f, 'rb')
! 		# else, assume it is an open file object already
! 		self.initfp(f)
! 
! 	#
! 	# User visible methods.
! 	#
! 	def getfp(self):
! 		return self._file
! 
! 	def rewind(self):
! 		self._data_seek_needed = 1
! 		self._soundpos = 0
! 
! 	def close(self):
! 		self._file = None
! 
! 	def tell(self):
! 		return self._soundpos
! 
! 	def getnchannels(self):
! 		return self._nchannels
! 
! 	def getnframes(self):
! 		return self._nframes
! 
! 	def getsampwidth(self):
! 		return self._sampwidth
! 
! 	def getframerate(self):
! 		return self._framerate
! 
! 	def getcomptype(self):
! 		return self._comptype
! 
! 	def getcompname(self):
! 		return self._compname
! 
! 	def getparams(self):
! 		return self.getnchannels(), self.getsampwidth(), \
! 			  self.getframerate(), self.getnframes(), \
! 			  self.getcomptype(), self.getcompname()
! 
! 	def getmarkers(self):
! 		return None
! 
! 	def getmark(self, id):
! 		raise Error, 'no marks'
! 
! 	def setpos(self, pos):
! 		if pos < 0 or pos > self._nframes:
! 			raise Error, 'position not in range'
! 		self._soundpos = pos
! 		self._data_seek_needed = 1
! 
! 	def readframes(self, nframes):
! 		if self._data_seek_needed:
! 			self._data_chunk.seek(0, 0)
! 			pos = self._soundpos * self._framesize
! 			if pos:
! 				self._data_chunk.seek(pos, 0)
! 			self._data_seek_needed = 0
! 		if nframes == 0:
! 			return ''
! 		if self._sampwidth > 1 and big_endian:
! 			# unfortunately the fromfile() method does not take
! 			# something that only looks like a file object, so
! 			# we have to reach into the innards of the chunk object
! 			import array
! 			chunk = self._data_chunk
! 			data = array.array(_array_fmts[self._sampwidth])
! 			nitems = nframes * self._nchannels
! 			if nitems * self._sampwidth > chunk.chunksize - chunk.size_read:
! 				nitems = (chunk.chunksize - chunk.size_read) / self._sampwidth
! 			data.fromfile(chunk.file.file, nitems)
! 			# "tell" data chunk how much was read
! 			chunk.size_read = chunk.size_read + nitems * self._sampwidth
! 			# do the same for the outermost chunk
! 			chunk = chunk.file
! 			chunk.size_read = chunk.size_read + nitems * self._sampwidth
! 			data.byteswap()
! 			data = data.tostring()
! 		else:
! 			data = self._data_chunk.read(nframes * self._framesize)
! 		if self._convert and data:
! 			data = self._convert(data)
! 		self._soundpos = self._soundpos + len(data) / (self._nchannels * self._sampwidth)
! 		return data
! 
! 	#
! 	# Internal methods.
! 	#
! 
! 	def _read_fmt_chunk(self, chunk):
! 		wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack('<hhllh', chunk.read(14))
! 		if wFormatTag == WAVE_FORMAT_PCM:
! 			sampwidth = struct.unpack('<h', chunk.read(2))[0]
! 			self._sampwidth = (sampwidth + 7) / 8
! 		else:
! 			raise Error, 'unknown format: ' + `wFormatTag`
! 		self._framesize = self._nchannels * self._sampwidth
! 		self._comptype = 'NONE'
! 		self._compname = 'not compressed'
  
  class Wave_write:
! 	# Variables used in this class:
! 	#
! 	# These variables are user settable through appropriate methods
! 	# of this class:
! 	# _file -- the open file with methods write(), close(), tell(), seek()
! 	#		set through the __init__() method
! 	# _comptype -- the AIFF-C compression type ('NONE' in AIFF)
! 	#		set through the setcomptype() or setparams() method
! 	# _compname -- the human-readable AIFF-C compression type
! 	#		set through the setcomptype() or setparams() method
! 	# _nchannels -- the number of audio channels
! 	#		set through the setnchannels() or setparams() method
! 	# _sampwidth -- the number of bytes per audio sample
! 	#		set through the setsampwidth() or setparams() method
! 	# _framerate -- the sampling frequency
! 	#		set through the setframerate() or setparams() method
! 	# _nframes -- the number of audio frames written to the header
! 	#		set through the setnframes() or setparams() method
! 	#
! 	# These variables are used internally only:
! 	# _datalength -- the size of the audio samples written to the header
! 	# _nframeswritten -- the number of frames actually written
! 	# _datawritten -- the size of the audio samples actually written
! 
! 	def __init__(self, f):
! 		if type(f) == type(''):
! 			f = __builtin__.open(f, 'wb')
! 		self.initfp(f)
! 
! 	def initfp(self, file):
! 		self._file = file
! 		self._convert = None
! 		self._nchannels = 0
! 		self._sampwidth = 0
! 		self._framerate = 0
! 		self._nframes = 0
! 		self._nframeswritten = 0
! 		self._datawritten = 0
! 		self._datalength = 0
! 
! 	def __del__(self):
! 		if self._file:
! 			self.close()
! 
! 	#
! 	# User visible methods.
! 	#
! 	def setnchannels(self, nchannels):
! 		if self._datawritten:
! 			raise Error, 'cannot change parameters after starting to write'
! 		if nchannels < 1:
! 			raise Error, 'bad # of channels'
! 		self._nchannels = nchannels
! 
! 	def getnchannels(self):
! 		if not self._nchannels:
! 			raise Error, 'number of channels not set'
! 		return self._nchannels
! 
! 	def setsampwidth(self, sampwidth):
! 		if self._datawritten:
! 			raise Error, 'cannot change parameters after starting to write'
! 		if sampwidth < 1 or sampwidth > 4:
! 			raise Error, 'bad sample width'
! 		self._sampwidth = sampwidth
! 
! 	def getsampwidth(self):
! 		if not self._sampwidth:
! 			raise Error, 'sample width not set'
! 		return self._sampwidth
! 
! 	def setframerate(self, framerate):
! 		if self._datawritten:
! 			raise Error, 'cannot change parameters after starting to write'
! 		if framerate <= 0:
! 			raise Error, 'bad frame rate'
! 		self._framerate = framerate
! 
! 	def getframerate(self):
! 		if not self._framerate:
! 			raise Error, 'frame rate not set'
! 		return self._framerate
! 
! 	def setnframes(self, nframes):
! 		if self._datawritten:
! 			raise Error, 'cannot change parameters after starting to write'
! 		self._nframes = nframes
! 
! 	def getnframes(self):
! 		return self._nframeswritten
! 
! 	def setcomptype(self, comptype, compname):
! 		if self._datawritten:
! 			raise Error, 'cannot change parameters after starting to write'
! 		if comptype not in ('NONE',):
! 			raise Error, 'unsupported compression type'
! 		self._comptype = comptype
! 		self._compname = compname
! 
! 	def getcomptype(self):
! 		return self._comptype
! 
! 	def getcompname(self):
! 		return self._compname
! 
! 	def setparams(self, (nchannels, sampwidth, framerate, nframes, comptype, compname)):
! 		if self._datawritten:
! 			raise Error, 'cannot change parameters after starting to write'
! 		self.setnchannels(nchannels)
! 		self.setsampwidth(sampwidth)
! 		self.setframerate(framerate)
! 		self.setnframes(nframes)
! 		self.setcomptype(comptype, compname)
! 
! 	def getparams(self):
! 		if not self._nchannels or not self._sampwidth or not self._framerate:
! 			raise Error, 'not all parameters set'
! 		return self._nchannels, self._sampwidth, self._framerate, \
! 			  self._nframes, self._comptype, self._compname
! 
! 	def setmark(self, id, pos, name):
! 		raise Error, 'setmark() not supported'
! 
! 	def getmark(self, id):
! 		raise Error, 'no marks'
! 
! 	def getmarkers(self):
! 		return None
! 				
! 	def tell(self):
! 		return self._nframeswritten
! 
! 	def writeframesraw(self, data):
! 		self._ensure_header_written(len(data))
! 		nframes = len(data) / (self._sampwidth * self._nchannels)
! 		if self._convert:
! 			data = self._convert(data)
! 		if self._sampwidth > 1 and big_endian:
! 			import array
! 			data = array.array(_array_fmts[self._sampwidth], data)
! 			data.byteswap()
! 			data.tofile(self._file)
! 			self._datawritten = self._datawritten + len(data) * self._sampwidth
! 		else:
! 			self._file.write(data)
! 			self._datawritten = self._datawritten + len(data)
! 		self._nframeswritten = self._nframeswritten + nframes
! 
! 	def writeframes(self, data):
! 		self.writeframesraw(data)
! 		if self._datalength != self._datawritten:
! 			self._patchheader()
! 
! 	def close(self):
! 		self._ensure_header_written(0)
! 		if self._datalength != self._datawritten:
! 			self._patchheader()
! 		self._file.flush()
! 		self._file = None
! 
! 	#
! 	# Internal methods.
! 	#
! 
! 	def _ensure_header_written(self, datasize):
! 		if not self._datawritten:
! 			if not self._nchannels:
! 				raise Error, '# channels not specified'
! 			if not self._sampwidth:
! 				raise Error, 'sample width not specified'
! 			if not self._framerate:
! 				raise Error, 'sampling rate not specified'
! 			self._write_header(datasize)
! 
! 	def _write_header(self, initlength):
! 		self._file.write('RIFF')
! 		if not self._nframes:
! 			self._nframes = initlength / (self._nchannels * self._sampwidth)
! 		self._datalength = self._nframes * self._nchannels * self._sampwidth
! 		self._form_length_pos = self._file.tell()
! 		self._file.write(struct.pack('<lsslhhllhhs',
! 			36 + self._datalength, 'WAVE', 'fmt ', 16,
! 			WAVE_FORMAT_PCM, self._nchannels, self._framerate,
! 			self._nchannels * self._framerate * self._sampwidth,
! 			self._nchannels * self._sampwidth,
! 			self._sampwidth * 8, 'data'))
! 		self._data_length_pos = self._file.tell()
! 		self._file.write(struct.pack('<l', self._datalength))
! 
! 	def _patchheader(self):
! 		if self._datawritten == self._datalength:
! 			return
! 		curpos = self._file.tell()
! 		self._file.seek(self._form_length_pos, 0)
! 		self._file.write(struct.pack('<l', 36 + self._datawritten))
! 		self._file.seek(self._data_length_pos, 0)
! 		self._file.write(struct.pack('<l', self._datawritten))
! 		self._file.seek(curpos, 0)
! 		self._datalength = self._datawritten
  
  def open(f, mode=None):
! 	if mode is None:
! 		if hasattr(f, 'mode'):
! 			mode = f.mode
! 		else:
! 			mode = 'rb'
! 	if mode in ('r', 'rb'):
! 		return Wave_read(f)
! 	elif mode in ('w', 'wb'):
! 		return Wave_write(f)
! 	else:
! 		raise Error, "mode must be 'r', 'rb', 'w', or 'wb'"
  
  openfp = open # B/W compatibility
--- 83,474 ----
  import struct
  if struct.pack("h", 1) == "\000\001":
!     big_endian = 1
  else:
!     big_endian = 0
  
  from chunk import Chunk
  
  class Wave_read:
!     """Variables used in this class:
  
+     These variables are available to the user though appropriate
+     methods of this class:
+     _file -- the open file with methods read(), close(), and seek()
+               set through the __init__() method
+     _nchannels -- the number of audio channels
+               available through the getnchannels() method
+     _nframes -- the number of audio frames
+               available through the getnframes() method
+     _sampwidth -- the number of bytes per audio sample
+               available through the getsampwidth() method
+     _framerate -- the sampling frequency
+               available through the getframerate() method
+     _comptype -- the AIFF-C compression type ('NONE' if AIFF)
+               available through the getcomptype() method
+     _compname -- the human-readable AIFF-C compression type
+               available through the getcomptype() method
+     _soundpos -- the position in the audio stream
+               available through the tell() method, set through the
+               setpos() method
+ 
+     These variables are used internally only:
+     _fmt_chunk_read -- 1 iff the FMT chunk has been read
+     _data_seek_needed -- 1 iff positioned correctly in audio
+               file for readframes()
+     _data_chunk -- instantiation of a chunk class for the DATA chunk
+     _framesize -- size of one frame in the file
+     """
+ 
+     def initfp(self, file):
+         self._convert = None
+         self._soundpos = 0
+         self._file = Chunk(file, bigendian = 0)
+         if self._file.getname() != 'RIFF':
+             raise Error, 'file does not start with RIFF id'
+         if self._file.read(4) != 'WAVE':
+             raise Error, 'not a WAVE file'
+         self._fmt_chunk_read = 0
+         self._data_chunk = None
+         while 1:
+             self._data_seek_needed = 1
+             try:
+                 chunk = Chunk(self._file, bigendian = 0)
+             except EOFError:
+                 break
+             chunkname = chunk.getname()
+             if chunkname == 'fmt ':
+                 self._read_fmt_chunk(chunk)
+                 self._fmt_chunk_read = 1
+             elif chunkname == 'data':
+                 if not self._fmt_chunk_read:
+                     raise Error, 'data chunk before fmt chunk'
+                 self._data_chunk = chunk
+                 self._nframes = chunk.chunksize / self._framesize
+                 self._data_seek_needed = 0
+                 break
+             chunk.skip()
+         if not self._fmt_chunk_read or not self._data_chunk:
+             raise Error, 'fmt chunk and/or data chunk missing'
+ 
+     def __init__(self, f):
+         if type(f) == type(''):
+             f = __builtin__.open(f, 'rb')
+         # else, assume it is an open file object already
+         self.initfp(f)
+ 
+     #
+     # User visible methods.
+     #
+     def getfp(self):
+         return self._file
+ 
+     def rewind(self):
+         self._data_seek_needed = 1
+         self._soundpos = 0
+ 
+     def close(self):
+         self._file = None
+ 
+     def tell(self):
+         return self._soundpos
+ 
+     def getnchannels(self):
+         return self._nchannels
+ 
+     def getnframes(self):
+         return self._nframes
+ 
+     def getsampwidth(self):
+         return self._sampwidth
+ 
+     def getframerate(self):
+         return self._framerate
+ 
+     def getcomptype(self):
+         return self._comptype
+ 
+     def getcompname(self):
+         return self._compname
+ 
+     def getparams(self):
+         return self.getnchannels(), self.getsampwidth(), \
+                self.getframerate(), self.getnframes(), \
+                self.getcomptype(), self.getcompname()
+ 
+     def getmarkers(self):
+         return None
+ 
+     def getmark(self, id):
+         raise Error, 'no marks'
+ 
+     def setpos(self, pos):
+         if pos < 0 or pos > self._nframes:
+             raise Error, 'position not in range'
+         self._soundpos = pos
+         self._data_seek_needed = 1
+ 
+     def readframes(self, nframes):
+         if self._data_seek_needed:
+             self._data_chunk.seek(0, 0)
+             pos = self._soundpos * self._framesize
+             if pos:
+                 self._data_chunk.seek(pos, 0)
+             self._data_seek_needed = 0
+         if nframes == 0:
+             return ''
+         if self._sampwidth > 1 and big_endian:
+             # unfortunately the fromfile() method does not take
+             # something that only looks like a file object, so
+             # we have to reach into the innards of the chunk object
+             import array
+             chunk = self._data_chunk
+             data = array.array(_array_fmts[self._sampwidth])
+             nitems = nframes * self._nchannels
+             if nitems * self._sampwidth > chunk.chunksize - chunk.size_read:
+                 nitems = (chunk.chunksize - chunk.size_read) / self._sampwidth
+             data.fromfile(chunk.file.file, nitems)
+             # "tell" data chunk how much was read
+             chunk.size_read = chunk.size_read + nitems * self._sampwidth
+             # do the same for the outermost chunk
+             chunk = chunk.file
+             chunk.size_read = chunk.size_read + nitems * self._sampwidth
+             data.byteswap()
+             data = data.tostring()
+         else:
+             data = self._data_chunk.read(nframes * self._framesize)
+         if self._convert and data:
+             data = self._convert(data)
+         self._soundpos = self._soundpos + len(data) / (self._nchannels * self._sampwidth)
+         return data
+ 
+     #
+     # Internal methods.
+     #
+ 
+     def _read_fmt_chunk(self, chunk):
+         wFormatTag, self._nchannels, self._framerate, dwAvgBytesPerSec, wBlockAlign = struct.unpack('<hhllh', chunk.read(14))
+         if wFormatTag == WAVE_FORMAT_PCM:
+             sampwidth = struct.unpack('<h', chunk.read(2))[0]
+             self._sampwidth = (sampwidth + 7) / 8
+         else:
+             raise Error, 'unknown format: ' + `wFormatTag`
+         self._framesize = self._nchannels * self._sampwidth
+         self._comptype = 'NONE'
+         self._compname = 'not compressed'
+ 
  class Wave_write:
!     """Variables used in this class:
! 
!     These variables are user settable through appropriate methods
!     of this class:
!     _file -- the open file with methods write(), close(), tell(), seek()
!               set through the __init__() method
!     _comptype -- the AIFF-C compression type ('NONE' in AIFF)
!               set through the setcomptype() or setparams() method
!     _compname -- the human-readable AIFF-C compression type
!               set through the setcomptype() or setparams() method
!     _nchannels -- the number of audio channels
!               set through the setnchannels() or setparams() method
!     _sampwidth -- the number of bytes per audio sample
!               set through the setsampwidth() or setparams() method
!     _framerate -- the sampling frequency
!               set through the setframerate() or setparams() method
!     _nframes -- the number of audio frames written to the header
!               set through the setnframes() or setparams() method
! 
!     These variables are used internally only:
!     _datalength -- the size of the audio samples written to the header
!     _nframeswritten -- the number of frames actually written
!     _datawritten -- the size of the audio samples actually written
!     """
! 
!     def __init__(self, f):
!         if type(f) == type(''):
!             f = __builtin__.open(f, 'wb')
!         self.initfp(f)
! 
!     def initfp(self, file):
!         self._file = file
!         self._convert = None
!         self._nchannels = 0
!         self._sampwidth = 0
!         self._framerate = 0
!         self._nframes = 0
!         self._nframeswritten = 0
!         self._datawritten = 0
!         self._datalength = 0
! 
!     def __del__(self):
!         if self._file:
!             self.close()
! 
!     #
!     # User visible methods.
!     #
!     def setnchannels(self, nchannels):
!         if self._datawritten:
!             raise Error, 'cannot change parameters after starting to write'
!         if nchannels < 1:
!             raise Error, 'bad # of channels'
!         self._nchannels = nchannels
! 
!     def getnchannels(self):
!         if not self._nchannels:
!             raise Error, 'number of channels not set'
!         return self._nchannels
! 
!     def setsampwidth(self, sampwidth):
!         if self._datawritten:
!             raise Error, 'cannot change parameters after starting to write'
!         if sampwidth < 1 or sampwidth > 4:
!             raise Error, 'bad sample width'
!         self._sampwidth = sampwidth
! 
!     def getsampwidth(self):
!         if not self._sampwidth:
!             raise Error, 'sample width not set'
!         return self._sampwidth
! 
!     def setframerate(self, framerate):
!         if self._datawritten:
!             raise Error, 'cannot change parameters after starting to write'
!         if framerate <= 0:
!             raise Error, 'bad frame rate'
!         self._framerate = framerate
! 
!     def getframerate(self):
!         if not self._framerate:
!             raise Error, 'frame rate not set'
!         return self._framerate
! 
!     def setnframes(self, nframes):
!         if self._datawritten:
!             raise Error, 'cannot change parameters after starting to write'
!         self._nframes = nframes
! 
!     def getnframes(self):
!         return self._nframeswritten
! 
!     def setcomptype(self, comptype, compname):
!         if self._datawritten:
!             raise Error, 'cannot change parameters after starting to write'
!         if comptype not in ('NONE',):
!             raise Error, 'unsupported compression type'
!         self._comptype = comptype
!         self._compname = compname
! 
!     def getcomptype(self):
!         return self._comptype
! 
!     def getcompname(self):
!         return self._compname
! 
!     def setparams(self, (nchannels, sampwidth, framerate, nframes, comptype, compname)):
!         if self._datawritten:
!             raise Error, 'cannot change parameters after starting to write'
!         self.setnchannels(nchannels)
!         self.setsampwidth(sampwidth)
!         self.setframerate(framerate)
!         self.setnframes(nframes)
!         self.setcomptype(comptype, compname)
! 
!     def getparams(self):
!         if not self._nchannels or not self._sampwidth or not self._framerate:
!             raise Error, 'not all parameters set'
!         return self._nchannels, self._sampwidth, self._framerate, \
!               self._nframes, self._comptype, self._compname
! 
!     def setmark(self, id, pos, name):
!         raise Error, 'setmark() not supported'
! 
!     def getmark(self, id):
!         raise Error, 'no marks'
! 
!     def getmarkers(self):
!         return None
!                 
!     def tell(self):
!         return self._nframeswritten
! 
!     def writeframesraw(self, data):
!         self._ensure_header_written(len(data))
!         nframes = len(data) / (self._sampwidth * self._nchannels)
!         if self._convert:
!             data = self._convert(data)
!         if self._sampwidth > 1 and big_endian:
!             import array
!             data = array.array(_array_fmts[self._sampwidth], data)
!             data.byteswap()
!             data.tofile(self._file)
!             self._datawritten = self._datawritten + len(data) * self._sampwidth
!         else:
!             self._file.write(data)
!             self._datawritten = self._datawritten + len(data)
!         self._nframeswritten = self._nframeswritten + nframes
! 
!     def writeframes(self, data):
!         self.writeframesraw(data)
!         if self._datalength != self._datawritten:
!             self._patchheader()
! 
!     def close(self):
!         self._ensure_header_written(0)
!         if self._datalength != self._datawritten:
!             self._patchheader()
!         self._file.flush()
!         self._file = None
! 
!     #
!     # Internal methods.
!     #
! 
!     def _ensure_header_written(self, datasize):
!         if not self._datawritten:
!             if not self._nchannels:
!                 raise Error, '# channels not specified'
!             if not self._sampwidth:
!                 raise Error, 'sample width not specified'
!             if not self._framerate:
!                 raise Error, 'sampling rate not specified'
!             self._write_header(datasize)
! 
!     def _write_header(self, initlength):
!         self._file.write('RIFF')
!         if not self._nframes:
!             self._nframes = initlength / (self._nchannels * self._sampwidth)
!         self._datalength = self._nframes * self._nchannels * self._sampwidth
!         self._form_length_pos = self._file.tell()
!         self._file.write(struct.pack('<lsslhhllhhs',
!             36 + self._datalength, 'WAVE', 'fmt ', 16,
!             WAVE_FORMAT_PCM, self._nchannels, self._framerate,
!             self._nchannels * self._framerate * self._sampwidth,
!             self._nchannels * self._sampwidth,
!             self._sampwidth * 8, 'data'))
!         self._data_length_pos = self._file.tell()
!         self._file.write(struct.pack('<l', self._datalength))
! 
!     def _patchheader(self):
!         if self._datawritten == self._datalength:
!             return
!         curpos = self._file.tell()
!         self._file.seek(self._form_length_pos, 0)
!         self._file.write(struct.pack('<l', 36 + self._datawritten))
!         self._file.seek(self._data_length_pos, 0)
!         self._file.write(struct.pack('<l', self._datawritten))
!         self._file.seek(curpos, 0)
!         self._datalength = self._datawritten
  
  def open(f, mode=None):
!     if mode is None:
!         if hasattr(f, 'mode'):
!             mode = f.mode
!         else:
!             mode = 'rb'
!     if mode in ('r', 'rb'):
!         return Wave_read(f)
!     elif mode in ('w', 'wb'):
!         return Wave_write(f)
!     else:
!         raise Error, "mode must be 'r', 'rb', 'w', or 'wb'"
  
  openfp = open # B/W compatibility

Index: whrandom.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/whrandom.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** whrandom.py	1998/08/10 20:07:53	1.14
--- whrandom.py	2000/02/04 15:28:42	1.15
***************
*** 1,53 ****
! #	WICHMANN-HILL RANDOM NUMBER GENERATOR
! #
! #	Wichmann, B. A. & Hill, I. D. (1982)
! #	Algorithm AS 183: 
! #	An efficient and portable pseudo-random number generator
! #	Applied Statistics 31 (1982) 188-190
! #
! #	see also: 
! #		Correction to Algorithm AS 183
! #		Applied Statistics 33 (1984) 123  
! #
! #		McLeod, A. I. (1985)
! #		A remark on Algorithm AS 183 
! #		Applied Statistics 34 (1985),198-200
! #
! #
! #	USE:
! #	whrandom.random()	yields double precision random numbers 
! #				uniformly distributed between 0 and 1.
! #
! #	whrandom.seed(x, y, z)	must be called before whrandom.random()
! #				to seed the generator
! #
! #	There is also an interface to create multiple independent
! #	random generators, and to choose from other ranges.
! 
! 
! #	Translated by Guido van Rossum from C source provided by
! #	Adrian Baddeley.
! 
! 
! # Multi-threading note: the random number generator used here is not
! # thread-safe; it is possible that nearly simultaneous calls in
! # different theads return the same random value.  To avoid this, you
! # have to use a lock around all calls.  (I didn't want to slow this
! # down in the serial case by using a lock here.)
  
  
  class whrandom:
- 	#
- 	# Initialize an instance.
- 	# Without arguments, initialize from current time.
- 	# With arguments (x, y, z), initialize from them.
- 	#
  	def __init__(self, x = 0, y = 0, z = 0):
  		self.seed(x, y, z)
! 	#
! 	# Set the seed from (x, y, z).
! 	# These must be integers in the range [0, 256).
! 	#
  	def seed(self, x = 0, y = 0, z = 0):
  		if not type(x) == type(y) == type(z) == type(0):
  			raise TypeError, 'seeds must be integers'
--- 1,51 ----
! """Wichman-Hill random number generator.
  
+ Wichmann, B. A. & Hill, I. D. (1982)
+ Algorithm AS 183: 
+ An efficient and portable pseudo-random number generator
+ Applied Statistics 31 (1982) 188-190
  
+ see also: 
+         Correction to Algorithm AS 183
+         Applied Statistics 33 (1984) 123  
+ 
+         McLeod, A. I. (1985)
+         A remark on Algorithm AS 183 
+         Applied Statistics 34 (1985),198-200
+ 
+ 
+ USE:
+ whrandom.random()       yields double precision random numbers 
+                         uniformly distributed between 0 and 1.
+ 
+ whrandom.seed(x, y, z)  must be called before whrandom.random()
+                         to seed the generator
+ 
+ There is also an interface to create multiple independent
+ random generators, and to choose from other ranges.
+ 
+ 
+ Translated by Guido van Rossum from C source provided by
+ Adrian Baddeley.
+ 
+ 
+ 
+ Multi-threading note: the random number generator used here is not
+ thread-safe; it is possible that nearly simultaneous calls in
+ different theads return the same random value.  To avoid this, you
+ have to use a lock around all calls.  (I didn't want to slow this
+ down in the serial case by using a lock here.)
+ """
+ 
  class whrandom:
  	def __init__(self, x = 0, y = 0, z = 0):
+ 		"""Initialize an instance.
+ 		Without arguments, initialize from current time.
+ 		With arguments (x, y, z), initialize from them."""
  		self.seed(x, y, z)
! 
  	def seed(self, x = 0, y = 0, z = 0):
+ 		"""Set the seed from (x, y, z).
+ 		These must be integers in the range [0, 256)."""
  		if not type(x) == type(y) == type(z) == type(0):
  			raise TypeError, 'seeds must be integers'
***************
*** 64,71 ****
  		# Zero is a poor seed, so substitute 1
  		self._seed = (x or 1, y or 1, z or 1)
! 	#
! 	# Get the next random number in the range [0.0, 1.0).
! 	#
  	def random(self):
  		# This part is thread-unsafe:
  		# BEGIN CRITICAL SECTION
--- 62,68 ----
  		# Zero is a poor seed, so substitute 1
  		self._seed = (x or 1, y or 1, z or 1)
! 
  	def random(self):
+ 		"""Get the next random number in the range [0.0, 1.0)."""
  		# This part is thread-unsafe:
  		# BEGIN CRITICAL SECTION
***************
*** 80,107 ****
  		#
  		return (x/30269.0 + y/30307.0 + z/30323.0) % 1.0
! 	#
! 	# Get a random number in the range [a, b).
! 	#
  	def uniform(self, a, b):
  		return a + (b-a) * self.random()
! 	#
! 	# Get a random integer in the range [a, b] including both end points.
! 	# (Deprecated; use randrange below.)
! 	#
  	def randint(self, a, b):
  		return self.randrange(a, b+1)
! 	#
! 	# Choose a random element from a non-empty sequence.
! 	#
  	def choice(self, seq):
  		return seq[int(self.random() * len(seq))]
! 	#
! 	# Choose a random item from range([start,] step[, stop]).
! 	# This fixes the problem with randint() which includes the
! 	# endpoint; in Python this is usually not what you want.
! 	#
! 	def randrange(self, start, stop=None, step=1,
! 		      # Do not supply the following arguments
! 		      int=int, default=None):
  		# This code is a bit messy to make it fast for the
  		# common case while still doing adequate error checking
--- 77,99 ----
  		#
  		return (x/30269.0 + y/30307.0 + z/30323.0) % 1.0
! 
  	def uniform(self, a, b):
+ 		"""Get a random number in the range [a, b)."""
  		return a + (b-a) * self.random()
! 
  	def randint(self, a, b):
+ 		"""Get a random integer in the range [a, b] including both end points.
+ 		(Deprecated; use randrange below.)"""
  		return self.randrange(a, b+1)
! 
  	def choice(self, seq):
+ 		"""Choose a random element from a non-empty sequence."""
  		return seq[int(self.random() * len(seq))]
! 
! 	def randrange(self, start, stop=None, step=1, int=int, default=None):
! 		"""Choose a random item from range([start,] step[, stop]).
! 		This fixes the problem with randint() which includes the
! 		endpoint; in Python this is usually not what you want.
! 	    Do not supply the 'int' and 'default' arguments."""
  		# This code is a bit messy to make it fast for the
  		# common case while still doing adequate error checking
***************
*** 137,141 ****
  
  # Initialize from the current time
- #
  _inst = whrandom()
  seed = _inst.seed
--- 129,132 ----



From guido@cnri.reston.va.us  Fri Feb  4 15:39:35 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 4 Feb 2000 10:39:35 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib asynchat.py,1.4,1.5 asyncore.py,1.3,1.4 binhex.py,1.11,1.12 copy.py,1.13,1.14 dircache.py,1.5,1.6 dospath.py,1.11,1.12 formatter.py,1.14,1.15 ftplib.py,1.39,1.40 getopt.py,1.8,1.9 gzip.py,1.16,1.17 locale.py,1.3,1.4 macurl2path.py,1.6,1.7 mimify.py,1.14,1.15 os.py,1.29,1.30 pdb.py,1.41,1.42 pyclbr.py,1.14,1.15 sched.py,1.10,1.11 smtplib.py,1.20,1.21 statcache.py,1.6,1.7 xmllib.py,1.16,1.17
Message-ID: <200002041539.KAA13722@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	asynchat.py asyncore.py binhex.py copy.py dircache.py 
	dospath.py formatter.py ftplib.py getopt.py gzip.py locale.py 
	macurl2path.py mimify.py os.py pdb.py pyclbr.py sched.py 
	smtplib.py statcache.py xmllib.py 
Log Message:
Actually, the previous batch's comment should have been different;
*this* set of patches is Ka-Ping's final sweep:

The attached patches update the standard library so that all modules
have docstrings beginning with one-line summaries.

A new docstring was added to formatter.  The docstring for os.py
was updated to mention nt, os2, ce in addition to posix, dos, mac.



Index: asynchat.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/asynchat.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** asynchat.py	1999/09/14 20:17:50	1.4
--- asynchat.py	2000/02/04 15:39:29	1.5
***************
*** 26,50 ****
  # ======================================================================
  
! import socket
! import asyncore
! import string
  
! # This class adds support for 'chat' style protocols - where one side
! # sends a 'command', and the other sends a response (examples would be
! # the common internet protocols - smtp, nntp, ftp, etc..).
  
! # The handle_read() method looks at the input stream for the current
! # 'terminator' (usually '\r\n' for single-line responses, '\r\n.\r\n'
! # for multi-line output), calling self.found_terminator() on its
! # receipt.
  
! # for example:
! # Say you build an async nntp client using this class.  At the start
! # of the connection, you'll have self.terminator set to '\r\n', in
! # order to process the single-line greeting.  Just before issuing a
! # 'LIST' command you'll set it to '\r\n.\r\n'.  The output of the LIST
! # command will be accumulated (using your own 'collect_incoming_data'
! # method) up to the terminator, and then control will be returned to
! # you - by calling your self.found_terminator() method
  
  class async_chat (asyncore.dispatcher):
--- 26,53 ----
  # ======================================================================
  
! """A class supporting chat-style (command/response) protocols.
! 
! This class adds support for 'chat' style protocols - where one side
! sends a 'command', and the other sends a response (examples would be
! the common internet protocols - smtp, nntp, ftp, etc..).
  
! The handle_read() method looks at the input stream for the current
! 'terminator' (usually '\r\n' for single-line responses, '\r\n.\r\n'
! for multi-line output), calling self.found_terminator() on its
! receipt.
  
! for example:
! Say you build an async nntp client using this class.  At the start
! of the connection, you'll have self.terminator set to '\r\n', in
! order to process the single-line greeting.  Just before issuing a
! 'LIST' command you'll set it to '\r\n.\r\n'.  The output of the LIST
! command will be accumulated (using your own 'collect_incoming_data'
! method) up to the terminator, and then control will be returned to
! you - by calling your self.found_terminator() method.
! """
  
! import socket
! import asyncore
! import string
  
  class async_chat (asyncore.dispatcher):

Index: asyncore.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/asyncore.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** asyncore.py	1999/09/14 20:15:19	1.3
--- asyncore.py	2000/02/04 15:39:29	1.4
***************
*** 26,29 ****
--- 26,50 ----
  # ======================================================================
  
+ """Basic infrastructure for asynchronous socket service clients and servers.
+ 
+ There are only two ways to have a program on a single processor do "more
+ than one thing at a time".  Multi-threaded programming is the simplest and 
+ most popular way to do it, but there is another very different technique,
+ that lets you have nearly all the advantages of multi-threading, without
+ actually using multiple threads. it's really only practical if your program
+ is largely I/O bound. If your program is CPU bound, then pre-emptive
+ scheduled threads are probably what you really need. Network servers are
+ rarely CPU-bound, however. 
+ 
+ If your operating system supports the select() system call in its I/O 
+ library (and nearly all do), then you can use it to juggle multiple
+ communication channels at once; doing other work while your I/O is taking
+ place in the "background."  Although this strategy can seem strange and
+ complex, especially at first, it is in many ways easier to understand and
+ control than multi-threaded programming. The module documented here solves
+ many of the difficult problems for you, making the task of building
+ sophisticated high-performance network servers and clients a snap. 
+ """
+ 
  import select
  import socket

Index: binhex.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/binhex.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** binhex.py	2000/02/02 15:10:14	1.11
--- binhex.py	2000/02/04 15:39:29	1.12
***************
*** 1,3 ****
! """binhex - Macintosh binhex compression/decompression
  
  easy interface:
--- 1,3 ----
! """Macintosh binhex compression/decompression.
  
  easy interface:

Index: copy.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/copy.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** copy.py	1999/01/25 21:37:02	1.13
--- copy.py	2000/02/04 15:39:29	1.14
***************
*** 1,5 ****
! """\
! Generic (shallow and deep) copying operations
! =============================================
  
  Interface summary:
--- 1,3 ----
! """Generic (shallow and deep) copying operations.
  
  Interface summary:

Index: dircache.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/dircache.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** dircache.py	2000/02/02 15:10:14	1.5
--- dircache.py	2000/02/04 15:39:29	1.6
***************
*** 1,5 ****
! """Return a sorted list of the files in a directory, using a cache
! to avoid reading the directory more often than necessary.
! Also contains a subroutine to append slashes to directories."""
  
  import os
--- 1,7 ----
! """Read and cache directory listings.
! 
! The listdir() routine returns a sorted list of the files in a directory,
! using a cache to avoid reading the directory more often than necessary.
! The annotate() routine appends slashes to directories."""
  
  import os

Index: dospath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/dospath.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** dospath.py	2000/02/04 15:10:32	1.11
--- dospath.py	2000/02/04 15:39:29	1.12
***************
*** 1,3 ****
! """Module 'dospath' -- common operations on DOS pathnames"""
  
  import os
--- 1,3 ----
! """Common operations on DOS pathnames."""
  
  import os

Index: formatter.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/formatter.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** formatter.py	1999/01/12 18:13:27	1.14
--- formatter.py	2000/02/04 15:39:29	1.15
***************
*** 1,2 ****
--- 1,22 ----
+ """Generic output formatting.
+ 
+ Formatter objects transform an abstract flow of formatting events into
+ specific output events on writer objects. Formatters manage several stack
+ structures to allow various properties of a writer object to be changed and
+ restored; writers need not be able to handle relative changes nor any sort
+ of ``change back'' operation. Specific writer properties which may be
+ controlled via formatter objects are horizontal alignment, font, and left
+ margin indentations. A mechanism is provided which supports providing
+ arbitrary, non-exclusive style settings to a writer as well. Additional
+ interfaces facilitate formatting events which are not reversible, such as
+ paragraph separation. 
+ 
+ Writer objects encapsulate device interfaces. Abstract devices, such as
+ file formats, are supported as well as physical devices. The provided
+ implementations all work with abstract devices. The interface makes
+ available mechanisms for setting the properties which formatter objects
+ manage and inserting data into the output. 
+ """
+ 
  import string
  import sys

Index: ftplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ftplib.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** ftplib.py	1999/08/18 21:51:10	1.39
--- ftplib.py	2000/02/04 15:39:29	1.40
***************
*** 1,3 ****
! '''An FTP client class, and some helper functions.
  Based on RFC 959: File Transfer Protocol
  (FTP), by J. Postel and J. Reynolds
--- 1,4 ----
! """An FTP client class and some helper functions.
! 
  Based on RFC 959: File Transfer Protocol
  (FTP), by J. Postel and J. Reynolds
***************
*** 32,36 ****
  A nice test that reveals some of the network dialogue would be:
  python ftplib.py -d localhost -l -p -l
! '''
  
  
--- 33,37 ----
  A nice test that reveals some of the network dialogue would be:
  python ftplib.py -d localhost -l -p -l
! """
  
  

Index: getopt.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/getopt.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** getopt.py	1999/12/21 22:38:40	1.8
--- getopt.py	2000/02/04 15:39:29	1.9
***************
*** 1,3 ****
! """Module getopt -- Parser for command line options.
  
  This module helps scripts to parse the command line arguments in
--- 1,3 ----
! """Parser for command line options.
  
  This module helps scripts to parse the command line arguments in

Index: gzip.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/gzip.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** gzip.py	2000/02/04 15:10:32	1.16
--- gzip.py	2000/02/04 15:39:29	1.17
***************
*** 1,3 ****
! """This module implements a function that reads and writes a gzipped file.
  The user of the file doesn't have to worry about the compression,
  but random access is not allowed."""
--- 1,4 ----
! """Functions that read and write gzipped files.
! 
  The user of the file doesn't have to worry about the compression,
  but random access is not allowed."""

Index: locale.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/locale.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** locale.py	1998/03/26 21:12:22	1.3
--- locale.py	2000/02/04 15:39:29	1.4
***************
*** 1,3 ****
! "Support for number formatting using the current locale settings"
  # Author: Martin von Loewis
  
--- 1,4 ----
! """Support for number formatting using the current locale settings."""
! 
  # Author: Martin von Loewis
  

Index: macurl2path.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/macurl2path.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** macurl2path.py	1999/06/01 14:36:56	1.6
--- macurl2path.py	2000/02/04 15:39:29	1.7
***************
*** 1,4 ****
! """Mac specific module for conversion between pathnames and URLs.
! Do not import directly, use urllib instead."""
  
  import string
--- 1,5 ----
! """Macintosh-specific module for conversion between pathnames and URLs.
! 
! Do not import directly; use urllib instead."""
  
  import string

Index: mimify.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mimify.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** mimify.py	2000/02/04 15:10:33	1.14
--- mimify.py	2000/02/04 15:39:29	1.15
***************
*** 1,5 ****
  #! /usr/bin/env python
  
! '''Mimification and unmimification of mail messages.
  
  Decode quoted-printable parts of a mail message or encode using
--- 1,5 ----
  #! /usr/bin/env python
  
! """Mimification and unmimification of mail messages.
  
  Decode quoted-printable parts of a mail message or encode using
***************
*** 20,24 ****
  to encode and decode respectively.  Infile defaults to standard
  input and outfile to standard output.
! '''
  
  # Configure
--- 20,24 ----
  to encode and decode respectively.  Infile defaults to standard
  input and outfile to standard output.
! """
  
  # Configure

Index: os.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/os.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** os.py	2000/02/04 15:10:33	1.29
--- os.py	2000/02/04 15:39:30	1.30
***************
*** 1,13 ****
! """os.py -- either mac, dos or posix depending on what system we're on.
  
  This exports:
!   - all functions from either posix or mac, e.g., os.unlink, os.stat, etc.
!   - os.path is either module posixpath or macpath
!   - os.name is either 'posix' or 'mac'
    - os.curdir is a string representing the current directory ('.' or ':')
    - os.pardir is a string representing the parent directory ('..' or '::')
    - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\')
!   - os.altsep is the alternatte pathname separator (None or '/')
    - os.pathsep is the component separator used in $PATH etc
    - os.defpath is the default search path for executables
  
--- 1,14 ----
! """OS routines for Mac, DOS, NT, or Posix depending on what system we're on.
  
  This exports:
!   - all functions from posix, nt, dos, os2, mac, or ce, e.g. unlink, stat, etc.
!   - os.path is one of the modules posixpath, ntpath, macpath, or dospath
!   - os.name is 'posix', 'nt', 'dos', 'os2', 'mac', or 'ce'
    - os.curdir is a string representing the current directory ('.' or ':')
    - os.pardir is a string representing the parent directory ('..' or '::')
    - os.sep is the (or a most common) pathname separator ('/' or ':' or '\\')
!   - os.altsep is the alternate pathname separator (None or '/')
    - os.pathsep is the component separator used in $PATH etc
+   - os.linesep is the line separator in text files ('\r' or '\n' or '\r\n')
    - os.defpath is the default search path for executables
  

Index: pdb.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pdb.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** pdb.py	2000/02/04 15:10:33	1.41
--- pdb.py	2000/02/04 15:39:30	1.42
***************
*** 1,5 ****
  #! /usr/bin/env python
  
! """pdb.py -- finally, a Python debugger!"""
  
  # (See pdb.doc for documentation.)
--- 1,5 ----
  #! /usr/bin/env python
  
! """A Python debugger."""
  
  # (See pdb.doc for documentation.)

Index: pyclbr.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/pyclbr.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** pyclbr.py	1999/06/16 12:28:12	1.14
--- pyclbr.py	2000/02/04 15:39:30	1.15
***************
*** 1,3 ****
! '''Parse a Python file and retrieve classes and methods.
  
  Parse enough of a Python file to recognize class and method
--- 1,3 ----
! """Parse a Python file and retrieve classes and methods.
  
  Parse enough of a Python file to recognize class and method
***************
*** 52,56 ****
    hairy logic that the import locator already does.  (This logic
    exists coded in Python in the freeze package.)
! ''' # ' <-- bow to font lock
  
  import os
--- 52,56 ----
    hairy logic that the import locator already does.  (This logic
    exists coded in Python in the freeze package.)
! """
  
  import os

Index: sched.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/sched.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** sched.py	1999/06/25 18:53:23	1.10
--- sched.py	2000/02/04 15:39:30	1.11
***************
*** 1,3 ****
! """Module sched -- a generally useful event scheduler class
  
  Each instance of this class manages its own queue.
--- 1,3 ----
! """A generally useful event scheduler class.
  
  Each instance of this class manages its own queue.

Index: smtplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/smtplib.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** smtplib.py	1999/11/28 17:11:06	1.20
--- smtplib.py	2000/02/04 15:39:30	1.21
***************
*** 1,5 ****
  #! /usr/bin/env python
  
! '''SMTP/ESMTP client class.
  
  Author: The Dragon De Monsyne <dragondm@integral.org>
--- 1,5 ----
  #! /usr/bin/env python
  
! """SMTP/ESMTP client class.
  
  Author: The Dragon De Monsyne <dragondm@integral.org>
***************
*** 38,42 ****
    (250, "Somebody OverHere <somebody@here.my.org>")
    >>> s.quit()
! '''
  
  import socket
--- 38,42 ----
    (250, "Somebody OverHere <somebody@here.my.org>")
    >>> s.quit()
! """
  
  import socket

Index: statcache.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/statcache.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** statcache.py	2000/02/04 15:28:41	1.6
--- statcache.py	2000/02/04 15:39:30	1.7
***************
*** 1,3 ****
! """Maintain a cache of file stats.
  There are functions to reset the cache or to selectively remove items.
  """
--- 1,4 ----
! """Maintain a cache of stat() information on files.
! 
  There are functions to reset the cache or to selectively remove items.
  """

Index: xmllib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/xmllib.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** xmllib.py	1999/08/26 15:52:33	1.16
--- xmllib.py	2000/02/04 15:39:30	1.17
***************
*** 1,3 ****
! # A parser for XML, using the derived class as static DTD.
  # Author: Sjoerd Mullender.
  
--- 1,4 ----
! """A parser for XML, using the derived class as static DTD."""
! 
  # Author: Sjoerd Mullender.
  



From fdrake@weyr.cnri.reston.va.us  Fri Feb  4 17:40:05 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 4 Feb 2000 12:40:05 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/html index.html.in,1.4,1.4.4.1
Message-ID: <200002041740.MAA09963@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/html
In directory weyr:/home/fdrake/projects/python/Doc-152p1/html

Modified Files:
      Tag: release152p1-patches
	index.html.in 
Log Message:

Make sure the version number in the <title> is updated; problem
reported by Peter Funk <pf@artcom-gmbh.de>.


Index: index.html.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/html/index.html.in,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** index.html.in	1999/05/27 21:56:11	1.4
--- index.html.in	2000/02/04 17:40:02	1.4.4.1
***************
*** 1,5 ****
  <html>
    <head>
!     <title>Python 1.5.2 Documentation</title>
      <link rel=STYLESHEET href="lib/lib.css" type="text/css">
      <style type="text/css">
--- 1,5 ----
  <html>
    <head>
!     <title>Python @VERSION@ Documentation</title>
      <link rel=STYLESHEET href="lib/lib.css" type="text/css">
      <style type="text/css">



From just@letterror.com  Fri Feb  4 17:44:14 2000
From: just@letterror.com (Just van Rossum)
Date: Fri, 4 Feb 2000 18:44:14 +0100
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
In-Reply-To: <20000204170033.146251CE24@dinsdale.python.org>
Message-ID: <l0310280bb4c0bf8409c7@[193.78.237.128]>

Guys,

They idea of sending diffs along is pretty cool (although I don't care for
it much), today's set was insanely large: more than 300K. This sucks.
Please, either don't send diffs altogether (my preference, this *is* about
CVS access after all!) or at least filter them so only small ones get
through.

Thanks,

Just




From guido@cnri.reston.va.us  Fri Feb  4 17:47:58 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 4 Feb 2000 12:47:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib dis.py,1.18,1.19
Message-ID: <200002041747.MAA14496@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	dis.py 
Log Message:
Added a simple test program to disassemble a file, invoked as __main__.


Index: dis.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/dis.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** dis.py	1999/05/03 18:09:53	1.18
--- dis.py	2000/02/04 17:47:55	1.19
***************
*** 252,253 ****
--- 252,280 ----
  def_op('MAKE_FUNCTION', 132)
  def_op('BUILD_SLICE', 133)
+ 
+ 
+ def _test():
+ 	"""Simple test program to disassemble a file."""
+ 	if sys.argv[1:]:
+ 		if sys.argv[2:]:
+ 			sys.stderr.write("usage: python dis.py [-|file]\n")
+ 			sys.exit(2)
+ 		fn = sys.argv[1]
+ 		if not fn or fn == "-":
+ 			fn = None
+ 	else:
+ 		fn = None
+ 	if not fn:
+ 		f = sys.stdin
+ 	else:
+ 		f = open(fn)
+ 	source = f.read()
+ 	if fn:
+ 		f.close()
+ 	else:
+ 		fn = "<stdin>"
+ 	code = compile(source, fn, "exec")
+ 	dis(code)
+ 
+ if __name__ == "__main__":
+ 	_test()



From pf@artcom-gmbh.de  Fri Feb  4 18:53:00 2000
From: pf@artcom-gmbh.de (Peter Funk)
Date: Fri, 4 Feb 2000 19:53:00 +0100 (MET)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
In-Reply-To: <l0310280bb4c0bf8409c7@[193.78.237.128]> from Just van Rossum at "Feb 4, 2000  6:44:14 pm"
Message-ID: <m12Gnqm-000CywC@artcom0.artcom-gmbh.de>

Just van Rossum:
> They idea of sending diffs along is pretty cool (although I don't care for
> it much), today's set was insanely large: more than 300K. This sucks.
> Please, either don't send diffs altogether (my preference, this *is* about
> CVS access after all!) or at least filter them so only small ones get
> through.

Well, I like browsing through the diffs (its fun to see, how it grows)
and I don't care much about this bandwith issue as long as they are
kept below 5 MB or so.  However I would prefer unified context diffs
(created by diff -u).  They would take up only half the space and are
(which is more important) much much easier to read.

I'm not very familar with CVS, so I would like to know which
tool/script produces these mails?  I've asked one of my employees,
who is more familar with CVS, but he also didn't know.

Regards, Peter
-- 
Peter Funk, Oldenburger Str.86, 27777 Ganderkesee, Tel: 04222 9502 70, Fax: -60


From bwarsaw@cnri.reston.va.us (Barry A. Warsaw)  Fri Feb  4 19:21:13 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw) (Barry A. Warsaw)
Date: Fri, 4 Feb 2000 14:21:13 -0500 (EST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
References: <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <m12Gnqm-000CywC@artcom0.artcom-gmbh.de>
Message-ID: <14491.9897.241252.677374@anthem.cnri.reston.va.us>

>>>>> "PF" == Peter Funk <pf@artcom-gmbh.de> writes:

    PF> Well, I like browsing through the diffs (its fun to see, how
    PF> it grows) and I don't care much about this bandwith issue as
    PF> long as they are kept below 5 MB or so.  However I would
    PF> prefer unified context diffs (created by diff -u).  They would
    PF> take up only half the space and are (which is more important)
    PF> much much easier to read.

The concensus when we voted last time was for context 2 diffs.
Personally, I find unifieds harder to read (and I think Guido
agreed).

    PF> I'm not very familar with CVS, so I would like to know which
    PF> tool/script produces these mails?  I've asked one of my
    PF> employees, who is more familar with CVS, but he also didn't
    PF> know.

It's a loginfo script that I've hacked together over the years.  It's
not pretty because it deals with lots of CVS, ssh, rsync, and sendmail
peculiarities.  I include it below for your enjoyment.  It would be
trivial to change to unifieds.

Invoked by a CVSROOT/loginfo entry like so:

python/dist	/projects/cvsroot/CVSROOT/syncmail --norecurse %{sVv} python-checkins@python.org

Enjoy,
-Barry

-------------------- snip snip --------------------
#! /depot/sundry/plat/bin/python

# To do:
#  -- why does this seem to take so long for some people?

"""Complicated syncing and notification for CVS checkins.

This script is intended to be run from the CVS loginfo file.  It handles
optional email notifications, fake reply addressing, and remote syncing via
rsync/ssh.  All these things are useful when you an Open Source software
development process.

Usage:

syncmail [--exclude=EX ...] [--norecurse] [--fg] [--nosync] [--munge] [-h]
         [--cvsroot=<path>] <%%S> [email-addrs ...]

Where:
    --exclude=EX
        any number of rsync --exclude= options.  These are passed directly to
        the rsync process

    --norecurse
        Do not do a recursive sync.  Sync only in the specified directory.

    --fg
        Run the rsync command in the foreground

    --nosync
        Do not run rsync at all

    --munge
        Munge return addresses.  Ordinarily, email is send with the
        /usr/ucb/Mail command and the return address is provided by the
        system.  However, when remote maintainers check in changes, their
        addresses will incorrectly seem like they come from the machine or
        domain running the CVS repository.  When this option is given, the
        user making the check in is looked up in the /etc/mail/aliases file.
        If a match is found, their alias expansion is forced as the return
        address and /bin/mailx is used as the MUA.

    --cvsroot=<path>
    	Use <path> as the environment variable CVSROOT.  Otherwise this
    	variable must exist in the environment.

    --help
    -h
        Print this text.

    <%%S>
        CVS %%s loginfo expansion.  This will be a single string containing
        the directory the checkin is being made in, relative to $CVSROOT,
        followed by the list of files that are changing

    email-addrs
        any number of email addrs if mail is to be sent.  if omitted, no mail
        is sent.
""" #'

# The shell transport used to run rsync over
SSH_CMD = '/depot/sundry/plat/bin/ssh -i <path-to-key> -l rsync'

# Exclude CVS lock files.  This is required because when the loginfo command
# is executed, CVS is still retaining locks on directories.  If the locks are
# rsync'd over, then the remote repository mirror will be hosed.
EXCLUDES = ['--exclude "#cvs.*"']
NORECURSE_EXCLUDE = '--exclude "/*/*"'

# The location of $CVSROOT on the remote machine
REM_CVSROOT = 'sweetpea:/projects/cvsroot'

# Template for the rsync command
RSYNC_OPTS = '-av --delete'
RSYNC_CMD = '/depot/sundry/plat/bin/rsync %(RSYNC_OPTS)s %(LOC_SYNCDIR)s %(REM_SYNCDIR)s %(XCLUDES)s'

# Notification command
MAIL_CMD = '%(mailcmd)s -s "CVS: %(SUBJECT)s" %(PEOPLE)s'
MAILPROG = '/usr/ucb/Mail'
MUNGE_MAILPROG = '/bin/mailx'
MUNGE_IGNORE = ['bwarsaw']
MUNGE_ALIASFILES = ['/etc/mail/aliases']

DIFF_HEAD_LINES = 20
DIFF_TAIL_LINES = 20
DIFF_TRUNCATE_IF_LARGER = 1000

import os
import sys
import string
import time



def find_aliases(files):
    aliases = {}
    for file in files:
	try:
	    fp = open(file)
	    lines = fp.readlines()
	    fp.close()
	except IOError:
	    continue
        # read the file
	for line in lines:
	    line = string.strip(string.lower(line))
	    # skip blank lines and comments
	    if line == '' or line[0] == '#':
		continue
	    # TBD: doesn't handle split lines
	    i = string.find(line, ":")
	    if i < 0:
		# skip this line
		continue
	    alias = line[:i]
	    expansion = string.strip(line[i+1:])
	    # some expansions are worthless.  drop everything that is a
	    # program, file, or distribution list
	    if string.count(expansion, "/") or \
	       string.count(expansion, "|") or \
	       string.count(expansion, ","):
		continue
	    # overwrites any previous entry
	    aliases[alias] = expansion
    return aliases



def calculate_diff(filespec):
    try:
        file, oldrev, newrev = string.split(filespec, ',')
    except ValueError:
        # No diff to report
        return ''
    # This /has/ to happen in the background, otherwise we'll run into CVS
    # lock contention.  What a crock.
    diffcmd = 'cvs -f diff -C 2 -r %s -r %s %s' % (oldrev, newrev, file)
    fp = os.popen(diffcmd)
    lines = fp.readlines()
    sts = fp.close()
    # ignore the error code, it always seems to be 1 :(
##    if sts:
##        return 'Error code %d occurred during diff\n' % (sts >> 8)
    if len(lines) > DIFF_TRUNCATE_IF_LARGER:
        removedlines = len(lines) - DIFF_HEAD_LINES - DIFF_TAIL_LINES
        del lines[DIFF_HEAD_LINES:-DIFF_TAIL_LINES]
        lines.insert(DIFF_HEAD_LINES,
                     '[...%d lines suppressed...]\n' % removedlines)
    return string.join(lines, '')



def blast_mail(mailcmd, filestodiff):
    # cannot wait for child process or that will cause parent to retain cvs
    # lock for too long.  Urg!
    if not os.fork():
        # in the child
        # give up the lock you cvs thang!
        time.sleep(2)
##        fp = open('/tmp/debug', 'a')
        fp = os.popen(cmd, 'w')
        fp.write(sys.stdin.read())
        fp.write('\n')
        # append the diffs if available
        for file in specs[1:]:
            fp.write(calculate_diff(file))
            fp.write('\n')
        fp.close()
        # doesn't matter what code we return, it isn't waited on
        os._exit(0)



os.environ['RSYNC_RSH'] = SSH_CMD

# scan args for options
recurse = 1
fg = 0
munge = 0
sync = 1
args = sys.argv[1:]
while args:
    arg = args[0]
    if arg[:len('--exclude=')] == '--exclude=':
        i = string.find(arg, '=')
        EXCLUDES = EXCLUDES + ['--exclude', '"%s"' % arg[i+1:]]
        del args[0]
    elif arg == '--norecurse':
        recurse = 0
        del args[0]
    elif arg == '--fg':
        fg = 1
        del args[0]
    elif arg == '--munge':
        munge = 1
        del args[0]
    elif arg == '--nosync':
        sync = 0
        del args[0]
    elif arg[:10] == '--cvsroot=':
        os.environ['CVSROOT'] = arg[10:]
        del args[0]
    elif arg in ('-h', '--help'):
        print __doc__
        sys.exit(0)
    else:
        break

# What follows is the specification containing the files that were modified.
# The argument actually must be split, with the first component containing the 
# directory the checkin is being made in, relative to $CVSROOT, followed by
# the list of files that are changing.
SUBJECT = args[0]
specs = string.split(args[0])
del args[0]

# Docs for CVS state that $CVSROOT will be the root in use
if not recurse:
    # The only way to really do non-recursion correctly, in the face of
    # possible deletions, is to specify the source directory completely
    # including the final slash, specify the target directory completely
    # including the final slash, and explicitly exclude /*/* which tells rsync 
    # to exclude the contents of all subdirectories.  The actual
    # subdirectories themselves will be included though (but that shouldn't be 
    # a problem).  This is necessary because if the source isn't a directory,
    # --delete will no-op.  This is highly oblique; thanks to KLM for the
    # solution!
    EXCLUDES.append(NORECURSE_EXCLUDE)

REPO_DIR = specs[0]
LOC_SYNCDIR = os.path.join(os.environ['CVSROOT'], REPO_DIR)
# make sure there's a trailing slash!!!
if LOC_SYNCDIR[-1] <> '/':
    LOC_SYNCDIR = LOC_SYNCDIR + '/'
REM_SYNCDIR = os.path.join(REM_CVSROOT, REPO_DIR)
# same
if REM_SYNCDIR[-1] <> '/':
    REM_SYNCDIR = REM_SYNCDIR + '/'

XCLUDES = string.join(EXCLUDES)

if sync:
    cmd = RSYNC_CMD % vars()
    if not fg:
        cmd = cmd + ' 2>&1 > /dev/null &'
    print '*****************************************\n', cmd, \
          '\n*****************************************'
    sts = os.system(cmd)

# if no email addresses, do not send mail
if args:
    # possibly munge the addresses
    PEOPLE = string.join(args)
    if munge:
        user = os.environ['USER'] or os.environ['LOGNAME']
        # this is necessary because some addresses just don't work with mailx
        # -r. e.g. -r bwarsaw@cnri.reston.va.us just causes mailx to send the
        # mail to the bit bucket.  I have no idea why.
        retaddr = None
	if user not in MUNGE_IGNORE:
	    aliases = find_aliases(MUNGE_ALIASFILES)
	    retaddr = aliases.get(user)
        # protect subject from /bin/sh
        mailcmd = MUNGE_MAILPROG
        if retaddr:
            mailcmd = mailcmd + ' -r ' + retaddr
    else:
        mailcmd = MAILPROG
    cmd = MAIL_CMD % vars()
    if not fg:
        cmd = cmd + ' 2>&1 > /dev/null'
    # Now do the mail command
    print 'Mailed', PEOPLE
    blast_mail(mailcmd, specs[1:])
    sts = 0

sys.exit(sts)



From fdrake@weyr.cnri.reston.va.us  Fri Feb  4 20:32:37 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 4 Feb 2000 15:32:37 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules md5module.c,2.12,2.13
Message-ID: <200002042032.PAA12317@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory weyr:/home/fdrake/projects/python/Modules

Modified Files:
	md5module.c 
Log Message:

Patch from Paul Sokolovsky <Paul.Sokolovsky@technologist.com>:

      Attached is patch (against 1.5.2 release) to allow some modules
to be buildable as pyd's (usual &PyType_Type stuff).


Index: md5module.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/md5module.c,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** md5module.c	1998/12/04 18:49:53	2.12
--- md5module.c	2000/02/04 20:32:35	2.13
***************
*** 201,205 ****
  
  statichere PyTypeObject MD5type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0,			  /*ob_size*/
  	"md5",			  /*tp_name*/
--- 201,205 ----
  
  statichere PyTypeObject MD5type = {
! 	PyObject_HEAD_INIT(NULL)
  	0,			  /*ob_size*/
  	"md5",			  /*tp_name*/
***************
*** 272,275 ****
--- 272,277 ----
  {
  	PyObject *m, *d;
+ 
+         MD5type.ob_type = &PyType_Type;
  	m = Py_InitModule3("md5", md5_functions, module_doc);
  	d = PyModule_GetDict(m);



From fdrake@weyr.cnri.reston.va.us  Fri Feb  4 20:33:30 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 4 Feb 2000 15:33:30 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules pcremodule.c,2.14,2.15
Message-ID: <200002042033.PAA12344@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory weyr:/home/fdrake/projects/python/Modules

Modified Files:
	pcremodule.c 
Log Message:

Patch from Paul Sokolovsky <Paul.Sokolovsky@technologist.com>:

      Attached is patch (against 1.5.2 release) to allow some modules
to be buildable as pyd's (usual &PyType_Type stuff).


Index: pcremodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/pcremodule.c,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** pcremodule.c	1999/02/01 17:09:00	2.14
--- pcremodule.c	2000/02/04 20:33:27	2.15
***************
*** 166,170 ****
  
  staticforward PyTypeObject Pcre_Type = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0,			/*ob_size*/
  	"Pcre",			/*tp_name*/
--- 166,170 ----
  
  staticforward PyTypeObject Pcre_Type = {
! 	PyObject_HEAD_INIT(NULL)
  	0,			/*ob_size*/
  	"Pcre",			/*tp_name*/
***************
*** 664,667 ****
--- 664,669 ----
  {
  	PyObject *m, *d;
+ 
+         Pcre_Type.ob_type = &PyType_Type;
  
  	/* Create the module and add the functions */



From fdrake@weyr.cnri.reston.va.us  Fri Feb  4 20:33:52 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 4 Feb 2000 15:33:52 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules arraymodule.c,2.37,2.38
Message-ID: <200002042033.PAA12369@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory weyr:/home/fdrake/projects/python/Modules

Modified Files:
	arraymodule.c 
Log Message:

Patch from Paul Sokolovsky <Paul.Sokolovsky@technologist.com>:

      Attached is patch (against 1.5.2 release) to allow some modules
to be buildable as pyd's (usual &PyType_Type stuff).


Index: arraymodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/arraymodule.c,v
retrieving revision 2.37
retrieving revision 2.38
diff -C2 -r2.37 -r2.38
*** arraymodule.c	2000/01/20 22:32:53	2.37
--- arraymodule.c	2000/02/04 20:33:49	2.38
***************
*** 1449,1453 ****
  
  statichere PyTypeObject Arraytype = {
! 	PyObject_HEAD_INIT(&PyType_Type)
  	0,
  	"array",
--- 1449,1453 ----
  
  statichere PyTypeObject Arraytype = {
! 	PyObject_HEAD_INIT(NULL)
  	0,
  	"array",
***************
*** 1477,1480 ****
--- 1477,1482 ----
  {
  	PyObject *m, *d;
+ 
+         Arraytype.ob_type = &PyType_Type;
  	m = Py_InitModule3("array", a_methods, module_doc);
  	d = PyModule_GetDict(m);



From skip@mojam.com (Skip Montanaro)  Fri Feb  4 21:32:31 2000
From: skip@mojam.com (Skip Montanaro) (Skip Montanaro)
Date: Fri, 4 Feb 2000 15:32:31 -0600 (CST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
In-Reply-To: <l0310280bb4c0bf8409c7@[193.78.237.128]>
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
Message-ID: <14491.17775.445979.618818@beluga.mojam.com>

    Just> They idea of sending diffs along is pretty cool (although I don't
    Just> care for it much), today's set was insanely large: more than
    Just> 300K. This sucks.

Amen to that...

I remember that Greg Stein did something to elide long context diffs (maybe
just trim them to 40kbytes or so?) in his checkin stuff.  Barry, I thought
you were about to adopt that convention as well.  Perhaps now would be the
time? 

Skip Montanaro | http://www.mojam.com/
skip@mojam.com | http://www.musi-cal.com/
847-971-7098
"Languages that change by catering to the tastes of non-users tend
not to do so well." - Doug Landauer


From bwarsaw@cnri.reston.va.us (Barry A. Warsaw)  Fri Feb  4 21:27:51 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw) (Barry A. Warsaw)
Date: Fri, 4 Feb 2000 16:27:51 -0500 (EST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
Message-ID: <14491.17495.983347.695677@anthem.cnri.reston.va.us>

>>>>> "SM" == Skip Montanaro <skip@mojam.com> writes:

    SM> I remember that Greg Stein did something to elide long context
    SM> diffs (maybe just trim them to 40kbytes or so?) in his checkin
    SM> stuff.  Barry, I thought you were about to adopt that
    SM> convention as well.  Perhaps now would be the time?

What Greg wanted, and what I implemented, was trimming the diffs if
they were larger than x lines, where x currently == 1000.  In that
case, we trim the diffs to 40 lines.  This doesn't help you if there
are tons of smaller diffs in a digest.  I'm happy to tweak the numbers
if people want, but I'm not going to do any significant work on the
script (no time).

-Barry


From just@letterror.com  Fri Feb  4 21:45:01 2000
From: just@letterror.com (Just van Rossum)
Date: Fri, 4 Feb 2000 22:45:01 +0100
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol
 1 #346 - 1 msg)
In-Reply-To: <14491.17495.983347.695677@anthem.cnri.reston.va.us>
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
Message-ID: <l03102812b4c0f7fd57a4@[193.78.237.128]>

At 4:27 PM -0500 04-02-2000, Barry A. Warsaw wrote:
>What Greg wanted, and what I implemented, was trimming the diffs if
>they were larger than x lines, where x currently == 1000.  In that
>case, we trim the diffs to 40 lines.  This doesn't help you if there
>are tons of smaller diffs in a digest.  I'm happy to tweak the numbers
>if people want, but I'm not going to do any significant work on the
>script (no time).

It seems today's situation proved that this is not the right approach...

Wouldn't it make much more sense to not send *any* diffs, but install
view-cvs.py or whatever it's called on *.python.org?

Or otherwise: remove the feature, and reinstate it when someone has gotten
'round to implement a sane version.

Just




From skip@mojam.com (Skip Montanaro)  Fri Feb  4 22:02:13 2000
From: skip@mojam.com (Skip Montanaro) (Skip Montanaro)
Date: Fri, 4 Feb 2000 16:02:13 -0600 (CST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
In-Reply-To: <14491.17495.983347.695677@anthem.cnri.reston.va.us>
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <14491.17495.983347.695677@anthem.cnri.reston.va.us>
Message-ID: <14491.19557.75652.954477@beluga.mojam.com>

    BAW> What Greg wanted, and what I implemented, was trimming the diffs if
    BAW> they were larger than x lines, where x currently == 1000.  In that
    BAW> case, we trim the diffs to 40 lines.  This doesn't help you if
    BAW> there are tons of smaller diffs in a digest.

This would suggest that Ping's recent documentation submission was an
"exceptional" event that would normally not be seen and can be ignored.
(How often do the CNRI folks commit one change to such a large number of
individual files?)

Skip


From bwarsaw@cnri.reston.va.us  Fri Feb  4 21:55:00 2000
From: bwarsaw@cnri.reston.va.us (bwarsaw@cnri.reston.va.us)
Date: Fri, 4 Feb 2000 16:55:00 -0500 (EST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol
 1 #346 - 1 msg)
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <l03102812b4c0f7fd57a4@[193.78.237.128]>
Message-ID: <14491.19124.921076.656526@anthem.cnri.reston.va.us>

>>>>> "JvR" == Just van Rossum <just@letterror.com> writes:

    JvR> It seems today's situation proved that this is not the right
    JvR> approach...

    JvR> Wouldn't it make much more sense to not send *any* diffs, but
    JvR> install view-cvs.py or whatever it's called on *.python.org?

http://cvs.python.org/

    JvR> Or otherwise: remove the feature, and reinstate it when
    JvR> someone has gotten 'round to implement a sane version.

Or chop the truncation limit down from 1000 lines.  Would 100 make
more sense?

-Barry


From fdrake@acm.org  Fri Feb  4 21:57:58 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Fri, 4 Feb 2000 16:57:58 -0500 (EST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol 1 #346 - 1 msg)
In-Reply-To: <14491.19557.75652.954477@beluga.mojam.com>
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <14491.17495.983347.695677@anthem.cnri.reston.va.us>
 <14491.19557.75652.954477@beluga.mojam.com>
Message-ID: <14491.19302.388993.659891@weyr.cnri.reston.va.us>

Skip Montanaro writes:
 > This would suggest that Ping's recent documentation submission was an
 > "exceptional" event that would normally not be seen and can be ignored.
 > (How often do the CNRI folks commit one change to such a large number of
 > individual files?)

  I've been known to do such things at times, but it is fairly
unusual.  (It's usually not on the Python tree as well, so it's not a
problem for people not on that project.)
  Of course, everyone knows how cruel I can be.  ;-)
  Anyway, for those not on the patches list yet, let it be known that
the first patch submitted through that list was not handled by The
Guido!


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From Fredrik Lundh" <effbot@telia.com  Fri Feb  4 22:08:14 2000
From: Fredrik Lundh" <effbot@telia.com (Fredrik Lundh)
Date: Fri, 4 Feb 2000 23:08:14 +0100
Subject: [Python-checkins] Insanity!
References: <20000204170033.146251CE24@dinsdale.python.org><l0310280bb4c0bf8409c7@[193.78.237.128]><14491.17775.445979.618818@beluga.mojam.com> <l03102812b4c0f7fd57a4@[193.78.237.128]>
Message-ID: <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>

> It seems today's situation proved that this is not the right =
approach...

on the other hand, how common are todays situation?
the recent crop of changes affected the whole standard
library.  I doubt there will=20

> Wouldn't it make much more sense to not send *any* diffs, but install
> view-cvs.py or whatever it's called on *.python.org?

it's already there: http://cvs.python.org/cgi-bin/viewcvs.cgi/

but clicking around in there takes ages.  maybe the script
could be tweaked to include complete URL's instead of diffs,
if the diff is larger than, say, 50 lines.  e.g:

http://cvs.python.org/cgi-bin/viewcvs.cgi/python/dist/src/Lib/bisect.py?r=
ev=3D1.4&content-type=3Dtext/vnd.viewcvs-markup

> Or otherwise: remove the feature, and reinstate it when someone has =
gotten
> 'round to implement a sane version.

or force everyone to get a cable modem ;-)

(maybe we could trick Barry into adding some kind of "optional
filter" mechanism to mailman, so people can pick their favourite
format?)

</F>



From Fredrik Lundh" <effbot@telia.com  Fri Feb  4 22:11:09 2000
From: Fredrik Lundh" <effbot@telia.com (Fredrik Lundh)
Date: Fri, 4 Feb 2000 23:11:09 +0100
Subject: [Python-checkins] Insanity!
References: <20000204170033.146251CE24@dinsdale.python.org><l0310280bb4c0bf8409c7@[193.78.237.128]><14491.17775.445979.618818@beluga.mojam.com> <l03102812b4c0f7fd57a4@[193.78.237.128]> <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
Message-ID: <008a01bf6f5c$be05f8c0$f4a7b5d4@hagrid>

I wrote:=20
> on the other hand, how common are todays situation?
> the recent crop of changes affected the whole standard
> library.  I doubt there will=20

and then accidentally pressed "send" before finishing
(and fixing) that paragraph...

(I'm sure you can all figure out what I was trying to say ;-)

</F>



From just@letterror.com  Fri Feb  4 22:17:52 2000
From: just@letterror.com (Just van Rossum)
Date: Fri, 4 Feb 2000 23:17:52 +0100
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol
 1 #346 - 1 msg)
In-Reply-To: <14491.19124.921076.656526@anthem.cnri.reston.va.us>
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <l03102812b4c0f7fd57a4@[193.78.237.128]>
Message-ID: <l03102813b4c0fc5d5f99@[193.78.237.128]>

At 4:55 PM -0500 04-02-2000, bwarsaw@cnri.reston.va.us wrote:
>http://cvs.python.org/

Oops. Cool! Never saw that on comp.lang.python.announce ;-)

>Or chop the truncation limit down from 1000 lines.  Would 100 make
>more sense?

I guess its too late for that now(*), but I'd like to make another argument
for *no* diffs in the checking messages:

For me, the log messages are much more important than the diffs. I want to
read what file has changed, and why it has changed. In most cases I don't
care about the details, and if I do, it's easy enough to go through cvs.
Now, because I'm just keeping a loose eye on what's going on, I subscribe
as digest. That's wonderful: every day I get one email with a list of
changes with their comments. However, with the diff stuff in place, I have
to wade through screenfuls of diffs that I don't care about to get to the
log messages that I *do* care about. They almost disappear in the mud.

Overall, the current situation is very much sub-optimal for me, and I even
consider unsubscribing. Note that this isn't so much an issue of
band-width, but of getting the information that I care about in a
convenient way.

*) I've never seen the "voting" you alluded to earlier, probably because
that took place on a list that I'm not on. I find that slightly odd...


Just




From bwarsaw@cnri.reston.va.us (Barry A. Warsaw)  Fri Feb  4 23:04:16 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw) (Barry A. Warsaw)
Date: Fri, 4 Feb 2000 18:04:16 -0500 (EST)
Subject: [Python-checkins] Insanity!
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <l03102812b4c0f7fd57a4@[193.78.237.128]>
 <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
Message-ID: <14491.23280.860145.794112@anthem.cnri.reston.va.us>

>>>>> "FL" == Fredrik Lundh <effbot@telia.com> writes:

    FL> (maybe we could trick Barry into adding some kind of "optional
    FL> filter" mechanism to mailman, so people can pick their
    FL> favourite format?)

That's actually not feasible because you'd crush the server if it had
to hand craft a message for each individual recipient.  The best you
can do is create two lists, one that includes the patches and another
that doesn't, but I'd like to avoid that.

-Barry


From bwarsaw@cnri.reston.va.us  Fri Feb  4 23:11:11 2000
From: bwarsaw@cnri.reston.va.us (bwarsaw@cnri.reston.va.us)
Date: Fri, 4 Feb 2000 18:11:11 -0500 (EST)
Subject: [Python-checkins] Insanity! (Re: Python-checkins digest, Vol
 1 #346 - 1 msg)
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <l03102812b4c0f7fd57a4@[193.78.237.128]>
 <l03102813b4c0fc5d5f99@[193.78.237.128]>
Message-ID: <14491.23695.786473.452572@anthem.cnri.reston.va.us>

>>>>> "JvR" == Just van Rossum <just@letterror.com> writes:

    JvR> Oops. Cool! Never saw that on comp.lang.python.announce ;-)

I've just corrected that!  Thanks.

I'll let Greg answer the rest, if he wants.

-Barry


From Fredrik Lundh" <effbot@telia.com  Fri Feb  4 23:18:56 2000
From: Fredrik Lundh" <effbot@telia.com (Fredrik Lundh)
Date: Sat, 5 Feb 2000 00:18:56 +0100
Subject: [Python-checkins] Insanity!
References: <20000204170033.146251CE24@dinsdale.python.org><l0310280bb4c0bf8409c7@[193.78.237.128]><14491.17775.445979.618818@beluga.mojam.com><l03102812b4c0f7fd57a4@[193.78.237.128]><008401bf6f5c$56574ee0$f4a7b5d4@hagrid> <14491.23280.860145.794112@anthem.cnri.reston.va.us>
Message-ID: <010501bf6f66$372b5fc0$f4a7b5d4@hagrid>

Barry A. Warsaw wrote:
>     FL> (maybe we could trick Barry into adding some kind of "optional
>     FL> filter" mechanism to mailman, so people can pick their
>     FL> favourite format?)
>=20
> That's actually not feasible because you'd crush the server if it had
> to hand craft a message for each individual recipient.  The best you
> can do is create two lists, one that includes the patches and another
> that doesn't, but I'd like to avoid that.

what I had in mind was to let mailman provide a "unified
interface" to two or more different mail sources...

(e.g. people sign up to python-checkins, and gets
messages from either python-checkins-standard or
python-checkins-slow_modem, depending on a user-
dependent setting...)

but no, you don't have to implement that now ;-)

</F>



From bwarsaw@cnri.reston.va.us  Fri Feb  4 23:23:16 2000
From: bwarsaw@cnri.reston.va.us (bwarsaw@cnri.reston.va.us)
Date: Fri, 4 Feb 2000 18:23:16 -0500 (EST)
Subject: [Python-checkins] Insanity!
References: <20000204170033.146251CE24@dinsdale.python.org>
 <l0310280bb4c0bf8409c7@[193.78.237.128]>
 <14491.17775.445979.618818@beluga.mojam.com>
 <l03102812b4c0f7fd57a4@[193.78.237.128]>
 <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
 <14491.23280.860145.794112@anthem.cnri.reston.va.us>
 <010501bf6f66$372b5fc0$f4a7b5d4@hagrid>
Message-ID: <14491.24420.290166.434941@anthem.cnri.reston.va.us>

>>>>> "FL" == Fredrik Lundh <effbot@telia.com> writes:

    FL> what I had in mind was to let mailman provide a "unified
    FL> interface" to two or more different mail sources...

    FL> (e.g. people sign up to python-checkins, and gets
    FL> messages from either python-checkins-standard or
    FL> python-checkins-slow_modem, depending on a user-
    FL> dependent setting...)

Cool idea!

    FL> but no, you don't have to implement that now ;-)

Phew! :)

-Barry


From gstein@lyra.org  Sat Feb  5 03:13:35 2000
From: gstein@lyra.org (Greg Stein)
Date: Fri, 4 Feb 2000 19:13:35 -0800 (PST)
Subject: [Python-checkins] Insanity!
In-Reply-To: <l03102812b4c0f7fd57a4@[193.78.237.128]>
Message-ID: <Pine.LNX.4.10.10002041401440.8462-100000@nebula.lyra.org>

On Fri, 4 Feb 2000, Just van Rossum wrote:
> At 4:27 PM -0500 04-02-2000, Barry A. Warsaw wrote:
> >What Greg wanted, and what I implemented, was trimming the diffs if
> >they were larger than x lines, where x currently == 1000.  In that
> >case, we trim the diffs to 40 lines.  This doesn't help you if there
> >are tons of smaller diffs in a digest.  I'm happy to tweak the numbers
> >if people want, but I'm not going to do any significant work on the
> >script (no time).
> 
> It seems today's situation proved that this is not the right approach...
> 
> Wouldn't it make much more sense to not send *any* diffs, but install
> view-cvs.py or whatever it's called on *.python.org?

As Barry mentioned, it is installed.

> Or otherwise: remove the feature, and reinstate it when someone has gotten
> 'round to implement a sane version.

Having the diff *actively* put in front of your face is much better than
needing to go look it up through a different mechanism (e.g. web browser
or the CVS command line). When a person gets a mail message with a notice
of change *and* the change, then they can review it right then and there.

I reviewed Ka-Ping's first change. Haven't done the second so far. I can
basically guarantee that wouldn't happen if I had to go and use a separate
tool on all those files.

Actively posting diffs is a great thing. It can definitely assist in
knowing that people will be reviewing the change. That size is needed for
a good review. More eyeballs, better software.

IMO, if the size bothers you, then unsubscribe. ViewCVS will show you when
things last changed. You can always go and look to see what has changed
within the past N days/weeks/whatever.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/



From gstein@lyra.org  Sat Feb  5 10:58:29 2000
From: gstein@lyra.org (Greg Stein)
Date: Sat, 5 Feb 2000 02:58:29 -0800 (PST)
Subject: [Python-checkins] truncation limit (was: Insanity!)
In-Reply-To: <14491.19124.921076.656526@anthem.cnri.reston.va.us>
Message-ID: <Pine.LNX.4.10.10002050256440.8462-100000@nebula.lyra.org>

On Fri, 4 Feb 2000 bwarsaw@cnri.reston.va.us wrote:
>...
>     JvR> Or otherwise: remove the feature, and reinstate it when
>     JvR> someone has gotten 'round to implement a sane version.
> 
> Or chop the truncation limit down from 1000 lines.  Would 100 make
> more sense?

I found that was a bit too small. A lot of simple changes can easily beat
100 lines. Just think about moving a few functions in a file. Or maybe
updating a structure and its uses. Or ...

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/



From gstein@lyra.org  Sat Feb  5 11:08:00 2000
From: gstein@lyra.org (Greg Stein)
Date: Sat, 5 Feb 2000 03:08:00 -0800 (PST)
Subject: [Python-checkins] viewcvs speed (was: Insanity!)
In-Reply-To: <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
Message-ID: <Pine.LNX.4.10.10002050259441.8462-100000@nebula.lyra.org>

On Fri, 4 Feb 2000, Fredrik Lundh wrote:
>...
> > Wouldn't it make much more sense to not send *any* diffs, but install
> > view-cvs.py or whatever it's called on *.python.org?
> 
> it's already there: http://cvs.python.org/cgi-bin/viewcvs.cgi/
> 
> but clicking around in there takes ages.

viewcvs.cgi is about 2300 lines of Python code. Unfortunately, it gets
parsed on each CGI invocation. There are two alternatives:

1) tiny stub which imports a module to do the work (with the hope that the
   resulting .pyc can be cached)
2) use my Python-in-a-script approach at:
      http://www.lyra.org/greg/python/index.html#dev

The former is harder for people to install. The latter is neat, but would
be harder for people to tweak the source and regenerate.

As a result, I decided to leave viewcvs.cgi as one big honker file that
makes it a real piece of cake for installation, editing, and use. But it
runs a bit slower :-)

Note: I think it is also the cvs.python.org machine. I get good speed on
my box (Linux, K6 200MHz).

>  maybe the script
> could be tweaked to include complete URL's instead of diffs,
> if the diff is larger than, say, 50 lines.  e.g:
> 
> http://cvs.python.org/cgi-bin/viewcvs.cgi/python/dist/src/Lib/bisect.py?rev=1.4&content-type=text/vnd.viewcvs-markup

Ooh. Sweet idea! In fact, I think that I'm gonna go and update my system
here to do that. Thanx!

However: I still woult NOT recommend omitting the diffs. I think our goal
is to increase the ease and propability that people will actually review
the checkins. Throwing a barrier in there such as "you must go use 'cvs
diff' to see the change" or "go use viewcvs to see it" or whatever, will
just serve to raise the barrier for a review. As long as notification and
change are wrapped into a single email, then our barrier is lower and
we'll get more eyeballs looking at the changes.

> > Or otherwise: remove the feature, and reinstate it when someone has gotten
> > 'round to implement a sane version.
> 
> or force everyone to get a cable modem ;-)
> 
> (maybe we could trick Barry into adding some kind of "optional
> filter" mechanism to mailman, so people can pick their favourite
> format?)

I've been wanting to send out the checkin email as an HTML email. The
things you could do! But Barry chastised me heavily for even mentioning
that. I don't think he likes HTML email :-)

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/



From tim_one@email.msn.com  Sat Feb  5 21:48:10 2000
From: tim_one@email.msn.com (Tim Peters)
Date: Sat, 5 Feb 2000 16:48:10 -0500
Subject: [Python-checkins] RE: Insanity!
In-Reply-To: <20000205170029.B92A91CDA7@dinsdale.python.org>
Message-ID: <002101bf7022$b27b7ea0$b7a0143f@tim>

Hey, *nobody* has a slower web connection than me, and the size of the
checkin digests doesn't bother me at all.  To the contrary, I was delighted
to have such a convenient way to see all the goodness Ping had done to the
docstrings.

At first I shared this complaint with Just:

> For me, the log messages are much more important than the diffs. I
> want to read what file has changed, and why it has changed. In most
> cases I don't care about the details, and if I do, it's easy enough
> to go through cvs.  Now, because I'm just keeping a loose eye on
> what's going on, I subscribe as digest. That's wonderful: every day
> I get one email with a list of changes with their comments. However,
> with the diff stuff in place, I have to wade through screenfuls of
> diffs that I don't care about to get to the log messages that I *do*
> care about. They almost disappear in the mud.

After about three weeks, it suddenly occurred to me that my mail reader has
a "search" button -- I simply rarely used it before!  Now I just zip over
the patches that don't interest me.

> ...
> *) I've never seen the "voting" you alluded to earlier, probably
> because that took place on a list that I'm not on. I find that
> slightly odd...

I think it was the Python-Dev list.  Dutch people aren't allowed on that,
though <wink>.

ain't-broke-don't-fix-ly y'rs  - tim




From a.eyre@optichrome.com  Mon Feb  7 11:01:51 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Mon, 7 Feb 2000 11:01:51 -0000
Subject: [Python-checkins] Insanity!
In-Reply-To: <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
Message-ID: <000b01bf715a$bc7eb8c0$3acbd9c2@peridot.optichrome.com>

> but clicking around in there takes ages.  maybe the script
> could be tweaked to include complete URL's instead of diffs,
> if the diff is larger than, say, 50 lines.  e.g:
>
>
http://cvs.python.org/cgi-bin/viewcvs.cgi/python/dist/src/Lib/bisect.py?rev=
1.4&content-type=text/vnd.viewcvs-markup

This seems like a reasonable compromise.

-----------------------------------------------------------------
Adrian Eyre <a.eyre@optichrome.com> - http://www.optichrome.com



From a.eyre@optichrome.com  Mon Feb  7 11:04:49 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Mon, 7 Feb 2000 11:04:49 -0000
Subject: [Python-checkins] RE: Insanity!
In-Reply-To: <002101bf7022$b27b7ea0$b7a0143f@tim>
Message-ID: <000c01bf715b$269fe940$3acbd9c2@peridot.optichrome.com>

>> *) I've never seen the "voting" you alluded to earlier, probably
>> because that took place on a list that I'm not on. I find that
>> slightly odd...

> I think it was the Python-Dev list.  Dutch people aren't allowed on that,
> though <wink>.

I remember the voting that took place, and I'm not on the python-dev list.
I'm sure it was on this list.

-----------------------------------------------------------------
Adrian Eyre <a.eyre@optichrome.com> - http://www.optichrome.com 



From fdrake@acm.org  Mon Feb  7 14:42:38 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Mon, 7 Feb 2000 09:42:38 -0500 (EST)
Subject: [Python-checkins] truncation limit (was: Insanity!)
In-Reply-To: <Pine.LNX.4.10.10002050256440.8462-100000@nebula.lyra.org>
References: <14491.19124.921076.656526@anthem.cnri.reston.va.us>
 <Pine.LNX.4.10.10002050256440.8462-100000@nebula.lyra.org>
Message-ID: <14494.55774.288636.108248@weyr.cnri.reston.va.us>

Greg Stein writes:
 > I found that was a bit too small. A lot of simple changes can easily beat
 > 100 lines. Just think about moving a few functions in a file. Or maybe
 > updating a structure and its uses. Or ...

  The description of the checkin should be sufficient for such things
most of the time.
  Let's trim the diffs more agressively and cut our losses in this
thread.  It taken way to long to decide on this.


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From fdrake@acm.org  Mon Feb  7 14:44:51 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Mon, 7 Feb 2000 09:44:51 -0500 (EST)
Subject: [Python-checkins] viewcvs speed (was: Insanity!)
In-Reply-To: <Pine.LNX.4.10.10002050259441.8462-100000@nebula.lyra.org>
References: <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
 <Pine.LNX.4.10.10002050259441.8462-100000@nebula.lyra.org>
Message-ID: <14494.55907.344044.868234@weyr.cnri.reston.va.us>

Greg Stein writes:
 > I've been wanting to send out the checkin email as an HTML email. The
 > things you could do! But Barry chastised me heavily for even mentioning
 > that. I don't think he likes HTML email :-)

  A lot of us don't!


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From bwarsaw@cnri.reston.va.us (Barry A. Warsaw)  Mon Feb  7 14:58:54 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw) (Barry A. Warsaw)
Date: Mon, 7 Feb 2000 09:58:54 -0500 (EST)
Subject: [Python-checkins] viewcvs speed (was: Insanity!)
References: <008401bf6f5c$56574ee0$f4a7b5d4@hagrid>
 <Pine.LNX.4.10.10002050259441.8462-100000@nebula.lyra.org>
Message-ID: <14494.56750.206497.330764@anthem.cnri.reston.va.us>

>>>>> "GS" == Greg Stein <gstein@lyra.org> writes:

    GS> I've been wanting to send out the checkin email as an HTML
    GS> email. The things you could do! But Barry chastised me heavily
    GS> for even mentioning that. I don't think he likes HTML email
    GS> :-)

Ug!  Okay, I'll admit I'm still a dinosaur.  I don't read my mail with
any of them fancy shmancy browser thingies that's all the rage with
the kids these days.

:)


From guido@cnri.reston.va.us  Mon Feb  7 15:29:45 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 7 Feb 2000 10:29:45 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/PCbuild bsddb.dsp,1.6,1.7
Message-ID: <200002071529.KAA17701@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/PCbuild
In directory eric:/projects/python/develop/guido/src/PCbuild

Modified Files:
	bsddb.dsp 
Log Message:
Same patch (also by Mark Hammond) for this straggler project file as
for the other projects, to move the x86 project names back to what
they were.


Index: bsddb.dsp
===================================================================
RCS file: /projects/cvsroot/python/dist/src/PCbuild/bsddb.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** bsddb.dsp	2000/01/20 21:31:41	1.6
--- bsddb.dsp	2000/02/07 15:29:43	1.7
***************
*** 19,24 ****
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "bsddb - Win32 x86 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "bsddb - Win32 x86 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "bsddb - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "bsddb - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
--- 19,24 ----
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "bsddb - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
! !MESSAGE "bsddb - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "bsddb - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")
  !MESSAGE "bsddb - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")
***************
*** 30,34 ****
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "bsddb - Win32 x86 Release"
  
  # PROP BASE Use_MFC 0
--- 30,34 ----
  # PROP Scc_LocalPath ".."
  
! !IF  "$(CFG)" == "bsddb - Win32 Release"
  
  # PROP BASE Use_MFC 0
***************
*** 61,65 ****
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "bsddb - Win32 x86 Debug"
  
  # PROP BASE Use_MFC 0
--- 61,65 ----
  # SUBTRACT LINK32 /pdb:none
  
! !ELSEIF  "$(CFG)" == "bsddb - Win32 Debug"
  
  # PROP BASE Use_MFC 0
***************
*** 160,165 ****
  # Begin Target
  
! # Name "bsddb - Win32 x86 Release"
! # Name "bsddb - Win32 x86 Debug"
  # Name "bsddb - Win32 Alpha Debug"
  # Name "bsddb - Win32 Alpha Release"
--- 160,165 ----
  # Begin Target
  
! # Name "bsddb - Win32 Release"
! # Name "bsddb - Win32 Debug"
  # Name "bsddb - Win32 Alpha Debug"
  # Name "bsddb - Win32 Alpha Release"
***************
*** 168,174 ****
  SOURCE=..\Modules\bsddbmodule.c
  
! !IF  "$(CFG)" == "bsddb - Win32 x86 Release"
  
! !ELSEIF  "$(CFG)" == "bsddb - Win32 x86 Debug"
  
  !ELSEIF  "$(CFG)" == "bsddb - Win32 Alpha Debug"
--- 168,174 ----
  SOURCE=..\Modules\bsddbmodule.c
  
! !IF  "$(CFG)" == "bsddb - Win32 Release"
  
! !ELSEIF  "$(CFG)" == "bsddb - Win32 Debug"
  
  !ELSEIF  "$(CFG)" == "bsddb - Win32 Alpha Debug"



From fdrake@weyr.cnri.reston.va.us  Mon Feb  7 17:15:51 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 7 Feb 2000 12:15:51 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_gdbm.py,1.2,1.3
Message-ID: <200002071715.MAA17619@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/test
In directory weyr:/home/fdrake/projects/python/Lib/test

Modified Files:
	test_gdbm.py 
Log Message:

Added test case for accessing gsbm database by key after it's closed;
it should raise gdbm.error.


Index: test_gdbm.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/test/test_gdbm.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** test_gdbm.py	1996/12/20 22:36:49	1.2
--- test_gdbm.py	2000/02/07 17:15:48	1.3
***************
*** 6,10 ****
  import gdbm
  from gdbm import error
! from test_support import verbose
  
  filename= '/tmp/delete_me'
--- 6,10 ----
  import gdbm
  from gdbm import error
! from test_support import verbose, TestFailed
  
  filename= '/tmp/delete_me'
***************
*** 19,22 ****
--- 19,28 ----
  g.has_key('a')
  g.close()
+ try:
+     g['a']
+ except error:
+     pass
+ else:
+     raise TestFailed, "expected gdbm.error accessing closed database"
  g = gdbm.open(filename, 'r')
  g.close()



From fdrake@weyr.cnri.reston.va.us  Mon Feb  7 17:19:44 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 7 Feb 2000 12:19:44 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules gdbmmodule.c,2.19,2.20
Message-ID: <200002071719.MAA17668@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory weyr:/home/fdrake/projects/python/Modules

Modified Files:
	gdbmmodule.c 
Log Message:

Protect against core dumps in gdbm: don't allow access by key once the 
database is closed.  Raise gdbm.error instead.

Bug report #198 submitted by Barry Haddow <bhaddow@orbism.com>.


Index: gdbmmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/gdbmmodule.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** gdbmmodule.c	1998/12/04 18:49:49	2.19
--- gdbmmodule.c	2000/02/07 17:19:41	2.20
***************
*** 156,160 ****
  	if (!PyArg_Parse(key, "s#", &krec.dptr, &krec.dsize) )
  		return NULL;
! 	
  	drec = gdbm_fetch(dp->di_dbm, krec);
  	if ( drec.dptr == 0 ) {
--- 156,165 ----
  	if (!PyArg_Parse(key, "s#", &krec.dptr, &krec.dsize) )
  		return NULL;
! 
! 	if (dp->di_dbm == NULL) {
! 		PyErr_SetString(DbmError,
! 				"GDBM object has already been closed");
! 		return NULL;
! 	}
  	drec = gdbm_fetch(dp->di_dbm, krec);
  	if ( drec.dptr == 0 ) {
***************
*** 181,185 ****
  	}
          if (dp->di_dbm == NULL) {
!                  PyErr_SetString(DbmError, "GDBM object has already been closed"); 
                   return -1; 
          }
--- 186,191 ----
  	}
          if (dp->di_dbm == NULL) {
!                  PyErr_SetString(DbmError,
!                                  "GDBM object has already been closed"); 
                   return -1; 
          }



From gstein@lyra.org  Tue Feb  8 03:03:18 2000
From: gstein@lyra.org (Greg Stein)
Date: Mon, 7 Feb 2000 19:03:18 -0800 (PST)
Subject: [Python-checkins] truncation limit
In-Reply-To: <14494.55774.288636.108248@weyr.cnri.reston.va.us>
Message-ID: <Pine.LNX.4.10.10002071851220.8462-100000@nebula.lyra.org>

On Mon, 7 Feb 2000, Fred L. Drake, Jr. wrote:
> Greg Stein writes:
>  > I found that was a bit too small. A lot of simple changes can easily beat
>  > 100 lines. Just think about moving a few functions in a file. Or maybe
>  > updating a structure and its uses. Or ...
> 
>   The description of the checkin should be sufficient for such things
> most of the time.

People are using python-checkins for one of two purposes:

1) monitoring what/how Python is changing
2) code reviewing the changes

Sending the diffs within the email supports (2). Aggressive trimming
simply removes that possibility, so you may as well not send any diffs.
Note that sending full diffs does not obviate (1); it merely provides
additional detail that people may not be interested in.

IMO, I think it is better to enable both purposes.

Guido is excellent at ensuring code is solid before checkin, but mistakes
can and do happen. In addition, there have been proposals to open up
checkins to more individuals. Or, to do some more up-front work to assist
Guido which may end up with the case of Guido not personally reviewing the
code as well and letting something slip by. Additional code review can
only help!

>   Let's trim the diffs more agressively and cut our losses in this
> thread.  It taken way to long to decide on this.

It took zero time. It was decided a month or so ago :-). You mean it is
taking too long to try and *change* the decision :-).

Enough bantering...

Let's get down to the underlying problem. People don't like the
possibility of large emails arriving in their inbox. That is what this
thread is all about. There isn't anything about "it is best to remove them
because <X>." There is *no* reason to remove the diffs, other than to
reduce the size of the emails. I say: read the checkin comment, then
ignore the diffs if you don't want to read them.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/



From fdrake@weyr.cnri.reston.va.us  Thu Feb 10 15:31:10 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 10 Feb 2000 10:31:10 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_zlib.py,1.6,1.7
Message-ID: <200002101531.KAA00186@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/test
In directory weyr:/home/fdrake/projects/python/Lib/test

Modified Files:
	test_zlib.py 
Log Message:

Make this pass the -tt test.


Index: test_zlib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/test/test_zlib.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** test_zlib.py	1999/03/22 19:23:17	1.6
--- test_zlib.py	2000/02/10 15:31:07	1.7
***************
*** 81,92 ****
  for sync in [zlib.Z_NO_FLUSH, zlib.Z_SYNC_FLUSH, zlib.Z_FULL_FLUSH]:
      for level in range(10):
! 	obj = zlib.compressobj( level )
!     	d = obj.compress( buf[:3000] )
! 	d = d + obj.flush( sync )
! 	d = d + obj.compress( buf[3000:] )
! 	d = d + obj.flush()
! 	if zlib.decompress(d) != buf:
! 	    print "Decompress failed: flush mode=%i, level=%i" % (sync,level)
! 	del obj
  
  def ignore():
--- 81,92 ----
  for sync in [zlib.Z_NO_FLUSH, zlib.Z_SYNC_FLUSH, zlib.Z_FULL_FLUSH]:
      for level in range(10):
!         obj = zlib.compressobj( level )
!         d = obj.compress( buf[:3000] )
!         d = d + obj.flush( sync )
!         d = d + obj.compress( buf[3000:] )
!         d = d + obj.flush()
!         if zlib.decompress(d) != buf:
!             print "Decompress failed: flush mode=%i, level=%i" % (sync,level)
!         del obj
  
  def ignore():



From fdrake@weyr.cnri.reston.va.us  Thu Feb 10 16:21:13 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 10 Feb 2000 11:21:13 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
Message-ID: <200002101621.LAA00758@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	string.py 
Log Message:

Detabify.

I ran "expand" instead of using Skip's patch, but it's all the same.


Index: string.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/string.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** string.py	2000/02/04 15:28:41	1.46
--- string.py	2000/02/10 16:21:11	1.47
***************
*** 198,205 ****
      """
      if type(s) == _StringType:
! 	return _float(s)
      else:
! 	raise TypeError('argument 1: expected string, %s found' %
! 			type(s).__name__)
  
  # Convert string to integer
--- 198,205 ----
      """
      if type(s) == _StringType:
!         return _float(s)
      else:
!         raise TypeError('argument 1: expected string, %s found' %
!                         type(s).__name__)
  
  # Convert string to integer
***************
*** 216,231 ****
      """
      try:
! 	s = args[0]
      except IndexError:
! 	raise TypeError('function requires at least 1 argument: %d given' %
! 			len(args))
      # Don't catch type error resulting from too many arguments to int().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
! 	return _apply(_int, args)
      else:
! 	raise TypeError('argument 1: expected string, %s found' %
! 			type(s).__name__)
  
  
--- 216,231 ----
      """
      try:
!         s = args[0]
      except IndexError:
!         raise TypeError('function requires at least 1 argument: %d given' %
!                         len(args))
      # Don't catch type error resulting from too many arguments to int().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
!         return _apply(_int, args)
      else:
!         raise TypeError('argument 1: expected string, %s found' %
!                         type(s).__name__)
  
  
***************
*** 244,259 ****
      """
      try:
! 	s = args[0]
      except IndexError:
! 	raise TypeError('function requires at least 1 argument: %d given' %
! 			len(args))
      # Don't catch type error resulting from too many arguments to long().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
! 	return _apply(_long, args)
      else:
! 	raise TypeError('argument 1: expected string, %s found' %
! 			type(s).__name__)
  
  
--- 244,259 ----
      """
      try:
!         s = args[0]
      except IndexError:
!         raise TypeError('function requires at least 1 argument: %d given' %
!                         len(args))
      # Don't catch type error resulting from too many arguments to long().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
!         return _apply(_long, args)
      else:
!         raise TypeError('argument 1: expected string, %s found' %
!                         type(s).__name__)
  
  
***************
*** 297,302 ****
      half = n/2
      if n%2 and width%2:
! 	# This ensures that center(center(s, i), j) = center(s, j)
! 	half = half+1
      return ' '*half +  s + ' '*(n-half)
  
--- 297,302 ----
      half = n/2
      if n%2 and width%2:
!         # This ensures that center(center(s, i), j) = center(s, j)
!         half = half+1
      return ' '*half +  s + ' '*(n-half)
  
***************
*** 317,321 ****
      sign = ''
      if s[0] in ('-', '+'):
! 	sign, s = s[0], s[1:]
      return sign + '0'*(width-n) + s
  
--- 317,321 ----
      sign = ''
      if s[0] in ('-', '+'):
!         sign, s = s[0], s[1:]
      return sign + '0'*(width-n) + s
  
***************
*** 332,341 ****
      res = line = ''
      for c in s:
! 	if c == '\t':
! 	    c = ' '*(tabsize - len(line) % tabsize)
! 	line = line + c
! 	if c == '\n':
! 	    res = res + line
! 	    line = ''
      return res + line
  
--- 332,341 ----
      res = line = ''
      for c in s:
!         if c == '\t':
!             c = ' '*(tabsize - len(line) % tabsize)
!         line = line + c
!         if c == '\n':
!             res = res + line
!             line = ''
      return res + line
  
***************
*** 386,397 ****
      """
      if len(fromstr) != len(tostr):
! 	raise ValueError, "maketrans arguments must have same length"
      global _idmapL
      if not _idmapL:
! 	_idmapL = map(None, _idmap)
      L = _idmapL[:]
      fromstr = map(ord, fromstr)
      for i in range(len(fromstr)):
! 	L[fromstr[i]] = tostr[i]
      return joinfields(L, "")
  
--- 386,397 ----
      """
      if len(fromstr) != len(tostr):
!         raise ValueError, "maketrans arguments must have same length"
      global _idmapL
      if not _idmapL:
!         _idmapL = map(None, _idmap)
      L = _idmapL[:]
      fromstr = map(ord, fromstr)
      for i in range(len(fromstr)):
!         L[fromstr[i]] = tostr[i]
      return joinfields(L, "")
  
***************
*** 427,429 ****
      letters = lowercase + uppercase
  except ImportError:
!     pass					  # Use the original versions
--- 427,429 ----
      letters = lowercase + uppercase
  except ImportError:
!     pass                                          # Use the original versions



From fdrake@weyr.cnri.reston.va.us  Thu Feb 10 17:17:17 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 10 Feb 2000 12:17:17 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib httplib.py,1.13,1.14 mailbox.py,1.17,1.18 mimetypes.py,1.10,1.11 rfc822.py,1.45,1.46 shelve.py,1.12,1.13 stringold.py,1.43,1.44 urllib2.py,1.2,1.3 whichdb.py,1.5,1.6
Message-ID: <200002101717.MAA06646@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	httplib.py mailbox.py mimetypes.py rfc822.py shelve.py 
	stringold.py urllib2.py whichdb.py 
Log Message:
Untabify to pass the -tt test.

Index: httplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/httplib.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** httplib.py	1999/12/07 21:35:20	1.13
--- httplib.py	2000/02/10 17:17:13	1.14
***************
*** 45,69 ****
  class FakeSocket:
      def __init__(self, sock, ssl):
! 	self.__sock = sock
! 	self.__ssl = ssl
! 	return
  
!     def makefile(self, mode):		# hopefully, never have to write
! 	msgbuf = ""
! 	while 1:
! 	    try:
! 		msgbuf = msgbuf + self.__ssl.read()
! 	    except socket.sslerror, msg:
! 		break
! 	return StringIO(msgbuf)
  
      def send(self, stuff, flags = 0):
! 	return self.__ssl.write(stuff)
  
      def recv(self, len = 1024, flags = 0):
! 	return self.__ssl.read(len)
  
      def __getattr__(self, attr):
! 	return getattr(self.__sock, attr)
  
  class HTTP:
--- 45,69 ----
  class FakeSocket:
      def __init__(self, sock, ssl):
!         self.__sock = sock
!         self.__ssl = ssl
!         return
  
!     def makefile(self, mode):           # hopefully, never have to write
!         msgbuf = ""
!         while 1:
!             try:
!                 msgbuf = msgbuf + self.__ssl.read()
!             except socket.sslerror, msg:
!                 break
!         return StringIO(msgbuf)
  
      def send(self, stuff, flags = 0):
!         return self.__ssl.write(stuff)
  
      def recv(self, len = 1024, flags = 0):
!         return self.__ssl.read(len)
  
      def __getattr__(self, attr):
!         return getattr(self.__sock, attr)
  
  class HTTP:

Index: mailbox.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mailbox.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** mailbox.py	1999/12/14 22:18:37	1.17
--- mailbox.py	2000/02/10 17:17:13	1.18
***************
*** 9,276 ****
  class _Mailbox:
  
! 	def __init__(self, fp):
! 		self.fp = fp
! 		self.seekp = 0
! 
! 	def seek(self, pos, whence=0):
! 		if whence==1:		# Relative to current position
! 			self.pos = self.pos + pos
! 		if whence==2:		# Relative to file's end
! 			self.pos = self.stop + pos
! 		else:			# Default - absolute position
! 			self.pos = self.start + pos
! 
! 	def next(self):
! 		while 1:
! 			self.fp.seek(self.seekp)
! 			try:
! 				self._search_start()
! 			except EOFError:
! 				self.seekp = self.fp.tell()
! 				return None
! 			start = self.fp.tell()
! 			self._search_end()
! 			self.seekp = stop = self.fp.tell()
! 			if start <> stop:
! 				break
! 		return rfc822.Message(_Subfile(self.fp, start, stop))
  
  class _Subfile:
  
! 	def __init__(self, fp, start, stop):
! 		self.fp = fp
! 		self.start = start
! 		self.stop = stop
! 		self.pos = self.start
! 
! 	def read(self, length = None):
! 		if self.pos >= self.stop:
! 			return ''
! 		remaining = self.stop - self.pos
! 		if length is None or length < 0:
! 			length = remaining
! 		elif length > remaining:
! 			length = remaining
! 		self.fp.seek(self.pos)
! 		data = self.fp.read(length)
! 		self.pos = self.fp.tell()
! 		return data
! 
! 	def readline(self, length = None):
! 		if self.pos >= self.stop:
! 			return ''
! 		if length is None:
! 			length = self.stop - self.pos
! 		self.fp.seek(self.pos)
! 		data = self.fp.readline(length)
! 		self.pos = self.fp.tell()
! 		return data
  
          def readlines(self, sizehint = -1):
! 		lines = []
! 		while 1:
! 			line = self.readline()
! 			if not line:
! 				break
! 			lines.append(line)
! 			if sizehint >= 0:
! 				sizehint = sizehint - len(line)
! 				if sizehint <= 0:
! 					break
! 		return lines
! 
! 	def tell(self):
! 		return self.pos - self.start
! 
! 	def seek(self, pos, whence=0):
! 		if whence == 0:
! 			self.pos = self.start + pos
! 		elif whence == 1:
! 			self.pos = self.pos + pos
! 		elif whence == 2:
! 			self.pos = self.stop + pos
  
! 	def close(self):
! 		del self.fp
  
  class UnixMailbox(_Mailbox):
  
! 	def _search_start(self):
! 		while 1:
! 			line = self.fp.readline()
! 			if not line:
! 				raise EOFError
! 			if line[:5] == 'From ' and self._isrealfromline(line):
! 				return
! 
! 	def _search_end(self):
! 		while 1:
! 			pos = self.fp.tell()
! 			line = self.fp.readline()
! 			if not line:
! 				return
! 			if line[:5] == 'From ' and self._isrealfromline(line):
! 				self.fp.seek(pos)
! 				return
! 
! 	# An overridable mechanism to test for From-line-ness.
! 	# You can either specify a different regular expression
! 	# or define a whole new _isrealfromline() method.
! 	# Note that this only gets called for lines starting with
! 	# the 5 characters "From ".
! 
! 	_fromlinepattern = r"From \s*[^\s]+\s+\w\w\w\s+\w\w\w\s+\d?\d\s+" \
! 			   r"\d?\d:\d\d(:\d\d)?(\s+[^\s]+)?\s+\d\d\d\d\s*$"
! 	_regexp = None
! 
! 	def _isrealfromline(self, line):
! 		if not self._regexp:
! 			import re
! 			self._regexp = re.compile(self._fromlinepattern)
! 		return self._regexp.match(line)
  
  class MmdfMailbox(_Mailbox):
  
! 	def _search_start(self):
! 		while 1:
! 			line = self.fp.readline()
! 			if not line:
! 				raise EOFError
! 			if line[:5] == '\001\001\001\001\n':
! 				return
! 
! 	def _search_end(self):
! 		while 1:
! 			pos = self.fp.tell()
! 			line = self.fp.readline()
! 			if not line:
! 				return
! 			if line == '\001\001\001\001\n':
! 				self.fp.seek(pos)
! 				return
  
  class MHMailbox:
  
! 	def __init__(self, dirname):
! 		import re
! 		pat = re.compile('^[0-9][0-9]*$')
! 		self.dirname = dirname
! 		files = os.listdir(self.dirname)
! 		self.boxes = []
! 		for f in files:
! 			if pat.match(f):
! 				self.boxes.append(f)
! 
! 	def next(self):
! 		if not self.boxes:
! 			return None
! 		fn = self.boxes[0]
! 		del self.boxes[0]
! 		fp = open(os.path.join(self.dirname, fn))
! 		return rfc822.Message(fp)
  
  class Maildir:
  
! 	# Qmail directory mailbox
  
! 	def __init__(self, dirname):
! 		import string
! 		self.dirname = dirname
! 		self.boxes = []
! 
! 		# check for new mail
! 		newdir = os.path.join(self.dirname, 'new')
! 		for file in os.listdir(newdir):
! 			if len(string.split(file, '.')) > 2:
! 				self.boxes.append(os.path.join(newdir, file))
! 
! 		# Now check for current mail in this maildir
! 		curdir = os.path.join(self.dirname, 'cur')
! 		for file in os.listdir(curdir):
! 			if len(string.split(file, '.')) > 2:
! 				self.boxes.append(os.path.join(curdir, file))
! 
! 	def next(self):
! 		if not self.boxes:
! 			return None
! 		fn = self.boxes[0]
! 		del self.boxes[0]
! 		fp = open(os.path.join(self.dirname, fn))
! 		return rfc822.Message(fp)
  
  class BabylMailbox(_Mailbox):
  
! 	def _search_start(self):
! 		while 1:
! 			line = self.fp.readline()
! 			if not line:
! 				raise EOFError
! 			if line == '*** EOOH ***\n':
! 				return
! 
! 	def _search_end(self):
! 		while 1:
! 			pos = self.fp.tell()
! 			line = self.fp.readline()
! 			if not line:
! 				return
! 			if line == '\037\014\n':
! 				self.fp.seek(pos)
! 				return
  
  
  def _test():
! 	import time
! 	import sys
! 	import string
! 	import os
! 
! 	args = sys.argv[1:]
! 	if not args:
! 		for key in 'MAILDIR', 'MAIL', 'LOGNAME', 'USER':
! 			if os.environ.has_key(key):
! 				mbox = os.environ[key]
! 				break
! 		else:
! 			print "$MAIL, $LOGNAME nor $USER set -- who are you?"
! 			return
! 	else:
! 		mbox = args[0]
! 	if mbox[:1] == '+':
! 		mbox = os.environ['HOME'] + '/Mail/' + mbox[1:]
! 	elif not '/' in mbox:
! 		mbox = '/usr/mail/' + mbox
! 	if os.path.isdir(mbox):
! 		if os.path.isdir(os.path.join(mbox, 'cur')):
! 			mb = Maildir(mbox)
! 		else:
! 			mb = MHMailbox(mbox)
! 	else:
! 		fp = open(mbox, 'r')
! 		mb = UnixMailbox(fp)
! 	
! 	msgs = []
! 	while 1:
! 		msg = mb.next()
! 		if msg is None:
! 			break
! 		msgs.append(msg)
! 		if len(args) <= 1:
! 			msg.fp = None
! 	if len(args) > 1:
! 		num = string.atoi(args[1])
! 		print 'Message %d body:'%num
! 		msg = msgs[num-1]
! 		msg.rewindbody()
! 		sys.stdout.write(msg.fp.read())
! 	else:
! 		print 'Mailbox',mbox,'has',len(msgs),'messages:'
! 		for msg in msgs:
! 			f = msg.getheader('from') or ""
! 			s = msg.getheader('subject') or ""
! 			d = msg.getheader('date') or ""
! 			print '%20.20s   %18.18s   %-30.30s'%(f, d[5:], s)
  
  
  if __name__ == '__main__':
! 	_test()
--- 9,276 ----
  class _Mailbox:
  
!         def __init__(self, fp):
!                 self.fp = fp
!                 self.seekp = 0
! 
!         def seek(self, pos, whence=0):
!                 if whence==1:           # Relative to current position
!                         self.pos = self.pos + pos
!                 if whence==2:           # Relative to file's end
!                         self.pos = self.stop + pos
!                 else:                   # Default - absolute position
!                         self.pos = self.start + pos
! 
!         def next(self):
!                 while 1:
!                         self.fp.seek(self.seekp)
!                         try:
!                                 self._search_start()
!                         except EOFError:
!                                 self.seekp = self.fp.tell()
!                                 return None
!                         start = self.fp.tell()
!                         self._search_end()
!                         self.seekp = stop = self.fp.tell()
!                         if start <> stop:
!                                 break
!                 return rfc822.Message(_Subfile(self.fp, start, stop))
  
  class _Subfile:
  
!         def __init__(self, fp, start, stop):
!                 self.fp = fp
!                 self.start = start
!                 self.stop = stop
!                 self.pos = self.start
! 
!         def read(self, length = None):
!                 if self.pos >= self.stop:
!                         return ''
!                 remaining = self.stop - self.pos
!                 if length is None or length < 0:
!                         length = remaining
!                 elif length > remaining:
!                         length = remaining
!                 self.fp.seek(self.pos)
!                 data = self.fp.read(length)
!                 self.pos = self.fp.tell()
!                 return data
! 
!         def readline(self, length = None):
!                 if self.pos >= self.stop:
!                         return ''
!                 if length is None:
!                         length = self.stop - self.pos
!                 self.fp.seek(self.pos)
!                 data = self.fp.readline(length)
!                 self.pos = self.fp.tell()
!                 return data
  
          def readlines(self, sizehint = -1):
!                 lines = []
!                 while 1:
!                         line = self.readline()
!                         if not line:
!                                 break
!                         lines.append(line)
!                         if sizehint >= 0:
!                                 sizehint = sizehint - len(line)
!                                 if sizehint <= 0:
!                                         break
!                 return lines
! 
!         def tell(self):
!                 return self.pos - self.start
! 
!         def seek(self, pos, whence=0):
!                 if whence == 0:
!                         self.pos = self.start + pos
!                 elif whence == 1:
!                         self.pos = self.pos + pos
!                 elif whence == 2:
!                         self.pos = self.stop + pos
  
!         def close(self):
!                 del self.fp
  
  class UnixMailbox(_Mailbox):
  
!         def _search_start(self):
!                 while 1:
!                         line = self.fp.readline()
!                         if not line:
!                                 raise EOFError
!                         if line[:5] == 'From ' and self._isrealfromline(line):
!                                 return
! 
!         def _search_end(self):
!                 while 1:
!                         pos = self.fp.tell()
!                         line = self.fp.readline()
!                         if not line:
!                                 return
!                         if line[:5] == 'From ' and self._isrealfromline(line):
!                                 self.fp.seek(pos)
!                                 return
! 
!         # An overridable mechanism to test for From-line-ness.
!         # You can either specify a different regular expression
!         # or define a whole new _isrealfromline() method.
!         # Note that this only gets called for lines starting with
!         # the 5 characters "From ".
! 
!         _fromlinepattern = r"From \s*[^\s]+\s+\w\w\w\s+\w\w\w\s+\d?\d\s+" \
!                            r"\d?\d:\d\d(:\d\d)?(\s+[^\s]+)?\s+\d\d\d\d\s*$"
!         _regexp = None
! 
!         def _isrealfromline(self, line):
!                 if not self._regexp:
!                         import re
!                         self._regexp = re.compile(self._fromlinepattern)
!                 return self._regexp.match(line)
  
  class MmdfMailbox(_Mailbox):
  
!         def _search_start(self):
!                 while 1:
!                         line = self.fp.readline()
!                         if not line:
!                                 raise EOFError
!                         if line[:5] == '\001\001\001\001\n':
!                                 return
! 
!         def _search_end(self):
!                 while 1:
!                         pos = self.fp.tell()
!                         line = self.fp.readline()
!                         if not line:
!                                 return
!                         if line == '\001\001\001\001\n':
!                                 self.fp.seek(pos)
!                                 return
  
  class MHMailbox:
  
!         def __init__(self, dirname):
!                 import re
!                 pat = re.compile('^[0-9][0-9]*$')
!                 self.dirname = dirname
!                 files = os.listdir(self.dirname)
!                 self.boxes = []
!                 for f in files:
!                         if pat.match(f):
!                                 self.boxes.append(f)
! 
!         def next(self):
!                 if not self.boxes:
!                         return None
!                 fn = self.boxes[0]
!                 del self.boxes[0]
!                 fp = open(os.path.join(self.dirname, fn))
!                 return rfc822.Message(fp)
  
  class Maildir:
  
!         # Qmail directory mailbox
  
!         def __init__(self, dirname):
!                 import string
!                 self.dirname = dirname
!                 self.boxes = []
! 
!                 # check for new mail
!                 newdir = os.path.join(self.dirname, 'new')
!                 for file in os.listdir(newdir):
!                         if len(string.split(file, '.')) > 2:
!                                 self.boxes.append(os.path.join(newdir, file))
! 
!                 # Now check for current mail in this maildir
!                 curdir = os.path.join(self.dirname, 'cur')
!                 for file in os.listdir(curdir):
!                         if len(string.split(file, '.')) > 2:
!                                 self.boxes.append(os.path.join(curdir, file))
! 
!         def next(self):
!                 if not self.boxes:
!                         return None
!                 fn = self.boxes[0]
!                 del self.boxes[0]
!                 fp = open(os.path.join(self.dirname, fn))
!                 return rfc822.Message(fp)
  
  class BabylMailbox(_Mailbox):
  
!         def _search_start(self):
!                 while 1:
!                         line = self.fp.readline()
!                         if not line:
!                                 raise EOFError
!                         if line == '*** EOOH ***\n':
!                                 return
! 
!         def _search_end(self):
!                 while 1:
!                         pos = self.fp.tell()
!                         line = self.fp.readline()
!                         if not line:
!                                 return
!                         if line == '\037\014\n':
!                                 self.fp.seek(pos)
!                                 return
  
  
  def _test():
!         import time
!         import sys
!         import string
!         import os
! 
!         args = sys.argv[1:]
!         if not args:
!                 for key in 'MAILDIR', 'MAIL', 'LOGNAME', 'USER':
!                         if os.environ.has_key(key):
!                                 mbox = os.environ[key]
!                                 break
!                 else:
!                         print "$MAIL, $LOGNAME nor $USER set -- who are you?"
!                         return
!         else:
!                 mbox = args[0]
!         if mbox[:1] == '+':
!                 mbox = os.environ['HOME'] + '/Mail/' + mbox[1:]
!         elif not '/' in mbox:
!                 mbox = '/usr/mail/' + mbox
!         if os.path.isdir(mbox):
!                 if os.path.isdir(os.path.join(mbox, 'cur')):
!                         mb = Maildir(mbox)
!                 else:
!                         mb = MHMailbox(mbox)
!         else:
!                 fp = open(mbox, 'r')
!                 mb = UnixMailbox(fp)
!         
!         msgs = []
!         while 1:
!                 msg = mb.next()
!                 if msg is None:
!                         break
!                 msgs.append(msg)
!                 if len(args) <= 1:
!                         msg.fp = None
!         if len(args) > 1:
!                 num = string.atoi(args[1])
!                 print 'Message %d body:'%num
!                 msg = msgs[num-1]
!                 msg.rewindbody()
!                 sys.stdout.write(msg.fp.read())
!         else:
!                 print 'Mailbox',mbox,'has',len(msgs),'messages:'
!                 for msg in msgs:
!                         f = msg.getheader('from') or ""
!                         s = msg.getheader('subject') or ""
!                         d = msg.getheader('date') or ""
!                         print '%20.20s   %18.18s   %-30.30s'%(f, d[5:], s)
  
  
  if __name__ == '__main__':
!         _test()

Index: mimetypes.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/mimetypes.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** mimetypes.py	1999/05/20 12:52:04	1.10
--- mimetypes.py	2000/02/10 17:17:13	1.11
***************
*** 31,36 ****
      "/usr/local/etc/httpd/conf/mime.types",
      "/usr/local/lib/netscape/mime.types",
!     "/usr/local/etc/httpd/conf/mime.types",	# Apache 1.2
!     "/usr/local/etc/mime.types",		# Apache 1.3
      ]
  
--- 31,36 ----
      "/usr/local/etc/httpd/conf/mime.types",
      "/usr/local/lib/netscape/mime.types",
!     "/usr/local/etc/httpd/conf/mime.types",     # Apache 1.2
!     "/usr/local/etc/mime.types",                # Apache 1.3
      ]
  
***************
*** 57,78 ****
      scheme, url = urllib.splittype(url)
      if scheme == 'data':
! 	# syntax of data URLs:
! 	# dataurl   := "data:" [ mediatype ] [ ";base64" ] "," data
! 	# mediatype := [ type "/" subtype ] *( ";" parameter )
! 	# data      := *urlchar
! 	# parameter := attribute "=" value
! 	# type/subtype defaults to "text/plain"
! 	comma = string.find(url, ',')
! 	if comma < 0:
! 	    # bad data URL
! 	    return None, None
! 	semi = string.find(url, ';', 0, comma)
! 	if semi >= 0:
! 	    type = url[:semi]
! 	else:
! 	    type = url[:comma]
! 	if '=' in type or '/' not in type:
! 	    type = 'text/plain'
! 	return type, None		# never compressed, so encoding is None
      base, ext = posixpath.splitext(url)
      while suffix_map.has_key(ext):
--- 57,78 ----
      scheme, url = urllib.splittype(url)
      if scheme == 'data':
!         # syntax of data URLs:
!         # dataurl   := "data:" [ mediatype ] [ ";base64" ] "," data
!         # mediatype := [ type "/" subtype ] *( ";" parameter )
!         # data      := *urlchar
!         # parameter := attribute "=" value
!         # type/subtype defaults to "text/plain"
!         comma = string.find(url, ',')
!         if comma < 0:
!             # bad data URL
!             return None, None
!         semi = string.find(url, ';', 0, comma)
!         if semi >= 0:
!             type = url[:semi]
!         else:
!             type = url[:comma]
!         if '=' in type or '/' not in type:
!             type = 'text/plain'
!         return type, None               # never compressed, so encoding is None
      base, ext = posixpath.splitext(url)
      while suffix_map.has_key(ext):

Index: rfc822.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/rfc822.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** rfc822.py	2000/01/17 14:11:04	1.45
--- rfc822.py	2000/02/10 17:17:14	1.46
***************
*** 333,341 ****
          raw = []
          for h in self.getallmatchingheaders(name):
! 	    if h[0] in ' \t':
! 	        raw.append(h)
! 	    else:
! 	        if raw:
! 		    raw.append(', ')
                  i = string.find(h, ':')
                  if i > 0:
--- 333,341 ----
          raw = []
          for h in self.getallmatchingheaders(name):
!             if h[0] in ' \t':
!                 raw.append(h)
!             else:
!                 if raw:
!                     raw.append(', ')
                  i = string.find(h, ':')
                  if i > 0:
***************
*** 787,791 ****
  _monthnames = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul',
                 'aug', 'sep', 'oct', 'nov', 'dec',
! 	       'january', 'february', 'march', 'april', 'may', 'june', 'july',
                 'august', 'september', 'october', 'november', 'december']
  _daynames = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
--- 787,791 ----
  _monthnames = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul',
                 'aug', 'sep', 'oct', 'nov', 'dec',
!                'january', 'february', 'march', 'april', 'may', 'june', 'july',
                 'august', 'september', 'october', 'november', 'december']
  _daynames = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
***************
*** 838,851 ****
      if mm > 12: mm = mm - 12
      if dd[-1] == ',':
! 	dd = dd[:-1]
      i = string.find(yy, ':')
      if i > 0:
! 	yy, tm = tm, yy
      if yy[-1] == ',':
! 	yy = yy[:-1]
      if yy[0] not in string.digits:
! 	yy, tz = tz, yy
      if tm[-1] == ',':
! 	tm = tm[:-1]
      tm = string.splitfields(tm, ':')
      if len(tm) == 2:
--- 838,851 ----
      if mm > 12: mm = mm - 12
      if dd[-1] == ',':
!         dd = dd[:-1]
      i = string.find(yy, ':')
      if i > 0:
!         yy, tm = tm, yy
      if yy[-1] == ',':
!         yy = yy[:-1]
      if yy[0] not in string.digits:
!         yy, tz = tz, yy
      if tm[-1] == ',':
!         tm = tm[:-1]
      tm = string.splitfields(tm, ':')
      if len(tm) == 2:

Index: shelve.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/shelve.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** shelve.py	1999/08/11 01:54:05	1.12
--- shelve.py	2000/02/10 17:17:14	1.13
***************
*** 11,27 ****
  object):
  
! 	import shelve
! 	d = shelve.open(filename) # open, with (g)dbm filename -- no suffix
  
! 	d[key] = data	# store data at key (overwrites old data if
! 			# using an existing key)
! 	data = d[key]	# retrieve data at key (raise KeyError if no
! 			# such key)
! 	del d[key]	# delete data stored at key (raises KeyError
! 			# if no such key)
! 	flag = d.has_key(key)	# true if the key exists
! 	list = d.keys()	# a list of all existing keys (slow!)
  
! 	d.close()	# close it
  
  Dependent on the implementation, closing a persistent dictionary may
--- 11,27 ----
  object):
  
!         import shelve
!         d = shelve.open(filename) # open, with (g)dbm filename -- no suffix
  
!         d[key] = data   # store data at key (overwrites old data if
!                         # using an existing key)
!         data = d[key]   # retrieve data at key (raise KeyError if no
!                         # such key)
!         del d[key]      # delete data stored at key (raises KeyError
!                         # if no such key)
!         flag = d.has_key(key)   # true if the key exists
!         list = d.keys() # a list of all existing keys (slow!)
  
!         d.close()       # close it
  
  Dependent on the implementation, closing a persistent dictionary may
***************
*** 32,157 ****
  
  try:
! 	from cPickle import Pickler, Unpickler
  except ImportError:
! 	from pickle import Pickler, Unpickler
  
  try:
! 	from cStringIO import StringIO
  except ImportError:
! 	from StringIO import StringIO
  
  
  class Shelf:
! 	"""Base class for shelf implementations.
  
! 	This is initialized with a dictionary-like object.
! 	See the module's __doc__ string for an overview of the interface.
! 	"""
! 
! 	def __init__(self, dict):
! 		self.dict = dict
! 	
! 	def keys(self):
! 		return self.dict.keys()
! 	
! 	def __len__(self):
! 		return len(self.dict)
! 	
! 	def has_key(self, key):
! 		return self.dict.has_key(key)
! 
! 	def get(self, key, default=None):
! 	        if self.dict.has_key(key):
! 			return self[key]
! 		return default
! 	
! 	def __getitem__(self, key):
! 		f = StringIO(self.dict[key])
! 		return Unpickler(f).load()
! 	
! 	def __setitem__(self, key, value):
! 		f = StringIO()
! 		p = Pickler(f)
! 		p.dump(value)
! 		self.dict[key] = f.getvalue()
! 	
! 	def __delitem__(self, key):
! 		del self.dict[key]
! 	
! 	def close(self):
! 		try:
! 			self.dict.close()
! 		except:
! 			pass
! 		self.dict = 0
! 
! 	def __del__(self):
! 		self.close()
! 
! 	def sync(self):
! 		if hasattr(self.dict, 'sync'):
! 			self.dict.sync()
! 	    
  
  class BsdDbShelf(Shelf):
! 	"""Shelf implementation using the "BSD" db interface.
  
! 	This adds methods first(), next(), previous(), last() and
! 	set_location() that have no counterpart in [g]dbm databases.
  
! 	The actual database must be opened using one of the "bsddb"
! 	modules "open" routines (i.e. bsddb.hashopen, bsddb.btopen or
! 	bsddb.rnopen) and passed to the constructor.
! 
! 	See the module's __doc__ string for an overview of the interface.
! 	"""
! 
! 	def __init__(self, dict):
! 	    Shelf.__init__(self, dict)
! 
! 	def set_location(self, key):
! 	     (key, value) = self.dict.set_location(key)
! 	     f = StringIO(value)
! 	     return (key, Unpickler(f).load())
! 
! 	def next(self):
! 	     (key, value) = self.dict.next()
! 	     f = StringIO(value)
! 	     return (key, Unpickler(f).load())
! 
! 	def previous(self):
! 	     (key, value) = self.dict.previous()
! 	     f = StringIO(value)
! 	     return (key, Unpickler(f).load())
! 
! 	def first(self):
! 	     (key, value) = self.dict.first()
! 	     f = StringIO(value)
! 	     return (key, Unpickler(f).load())
! 
! 	def last(self):
! 	     (key, value) = self.dict.last()
! 	     f = StringIO(value)
! 	     return (key, Unpickler(f).load())
  
  
  class DbfilenameShelf(Shelf):
! 	"""Shelf implementation using the "anydbm" generic dbm interface.
  
! 	This is initialized with the filename for the dbm database.
! 	See the module's __doc__ string for an overview of the interface.
! 	"""
! 	
! 	def __init__(self, filename, flag='c'):
! 		import anydbm
! 		Shelf.__init__(self, anydbm.open(filename, flag))
  
  
  def open(filename, flag='c'):
! 	"""Open a persistent dictionary for reading and writing.
  
! 	Argument is the filename for the dbm database.
! 	See the module's __doc__ string for an overview of the interface.
! 	"""
! 	
! 	return DbfilenameShelf(filename, flag)
--- 32,157 ----
  
  try:
!         from cPickle import Pickler, Unpickler
  except ImportError:
!         from pickle import Pickler, Unpickler
  
  try:
!         from cStringIO import StringIO
  except ImportError:
!         from StringIO import StringIO
  
  
  class Shelf:
!         """Base class for shelf implementations.
  
!         This is initialized with a dictionary-like object.
!         See the module's __doc__ string for an overview of the interface.
!         """
! 
!         def __init__(self, dict):
!                 self.dict = dict
!         
!         def keys(self):
!                 return self.dict.keys()
!         
!         def __len__(self):
!                 return len(self.dict)
!         
!         def has_key(self, key):
!                 return self.dict.has_key(key)
! 
!         def get(self, key, default=None):
!                 if self.dict.has_key(key):
!                         return self[key]
!                 return default
!         
!         def __getitem__(self, key):
!                 f = StringIO(self.dict[key])
!                 return Unpickler(f).load()
!         
!         def __setitem__(self, key, value):
!                 f = StringIO()
!                 p = Pickler(f)
!                 p.dump(value)
!                 self.dict[key] = f.getvalue()
!         
!         def __delitem__(self, key):
!                 del self.dict[key]
!         
!         def close(self):
!                 try:
!                         self.dict.close()
!                 except:
!                         pass
!                 self.dict = 0
! 
!         def __del__(self):
!                 self.close()
! 
!         def sync(self):
!                 if hasattr(self.dict, 'sync'):
!                         self.dict.sync()
!             
  
  class BsdDbShelf(Shelf):
!         """Shelf implementation using the "BSD" db interface.
  
!         This adds methods first(), next(), previous(), last() and
!         set_location() that have no counterpart in [g]dbm databases.
  
!         The actual database must be opened using one of the "bsddb"
!         modules "open" routines (i.e. bsddb.hashopen, bsddb.btopen or
!         bsddb.rnopen) and passed to the constructor.
! 
!         See the module's __doc__ string for an overview of the interface.
!         """
! 
!         def __init__(self, dict):
!             Shelf.__init__(self, dict)
! 
!         def set_location(self, key):
!              (key, value) = self.dict.set_location(key)
!              f = StringIO(value)
!              return (key, Unpickler(f).load())
! 
!         def next(self):
!              (key, value) = self.dict.next()
!              f = StringIO(value)
!              return (key, Unpickler(f).load())
! 
!         def previous(self):
!              (key, value) = self.dict.previous()
!              f = StringIO(value)
!              return (key, Unpickler(f).load())
! 
!         def first(self):
!              (key, value) = self.dict.first()
!              f = StringIO(value)
!              return (key, Unpickler(f).load())
! 
!         def last(self):
!              (key, value) = self.dict.last()
!              f = StringIO(value)
!              return (key, Unpickler(f).load())
  
  
  class DbfilenameShelf(Shelf):
!         """Shelf implementation using the "anydbm" generic dbm interface.
  
!         This is initialized with the filename for the dbm database.
!         See the module's __doc__ string for an overview of the interface.
!         """
!         
!         def __init__(self, filename, flag='c'):
!                 import anydbm
!                 Shelf.__init__(self, anydbm.open(filename, flag))
  
  
  def open(filename, flag='c'):
!         """Open a persistent dictionary for reading and writing.
  
!         Argument is the filename for the dbm database.
!         See the module's __doc__ string for an overview of the interface.
!         """
!         
!         return DbfilenameShelf(filename, flag)

Index: stringold.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/stringold.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** stringold.py	1999/10/12 19:54:40	1.43
--- stringold.py	2000/02/10 17:17:14	1.44
***************
*** 200,207 ****
      """
      if type(s) == _StringType:
! 	return _float(s)
      else:
! 	raise TypeError('argument 1: expected string, %s found' %
! 			type(s).__name__)
  
  # Convert string to integer
--- 200,207 ----
      """
      if type(s) == _StringType:
!         return _float(s)
      else:
!         raise TypeError('argument 1: expected string, %s found' %
!                         type(s).__name__)
  
  # Convert string to integer
***************
*** 218,233 ****
      """
      try:
! 	s = args[0]
      except IndexError:
! 	raise TypeError('function requires at least 1 argument: %d given' %
! 			len(args))
      # Don't catch type error resulting from too many arguments to int().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
! 	return _apply(_int, args)
      else:
! 	raise TypeError('argument 1: expected string, %s found' %
! 			type(s).__name__)
  
  
--- 218,233 ----
      """
      try:
!         s = args[0]
      except IndexError:
!         raise TypeError('function requires at least 1 argument: %d given' %
!                         len(args))
      # Don't catch type error resulting from too many arguments to int().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
!         return _apply(_int, args)
      else:
!         raise TypeError('argument 1: expected string, %s found' %
!                         type(s).__name__)
  
  
***************
*** 246,261 ****
      """
      try:
! 	s = args[0]
      except IndexError:
! 	raise TypeError('function requires at least 1 argument: %d given' %
! 			len(args))
      # Don't catch type error resulting from too many arguments to long().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
! 	return _apply(_long, args)
      else:
! 	raise TypeError('argument 1: expected string, %s found' %
! 			type(s).__name__)
  
  
--- 246,261 ----
      """
      try:
!         s = args[0]
      except IndexError:
!         raise TypeError('function requires at least 1 argument: %d given' %
!                         len(args))
      # Don't catch type error resulting from too many arguments to long().  The
      # error message isn't compatible but the error type is, and this function
      # is complicated enough already.
      if type(s) == _StringType:
!         return _apply(_long, args)
      else:
!         raise TypeError('argument 1: expected string, %s found' %
!                         type(s).__name__)
  
  
***************
*** 299,304 ****
      half = n/2
      if n%2 and width%2:
! 	# This ensures that center(center(s, i), j) = center(s, j)
! 	half = half+1
      return ' '*half +  s + ' '*(n-half)
  
--- 299,304 ----
      half = n/2
      if n%2 and width%2:
!         # This ensures that center(center(s, i), j) = center(s, j)
!         half = half+1
      return ' '*half +  s + ' '*(n-half)
  
***************
*** 319,323 ****
      sign = ''
      if s[0] in ('-', '+'):
! 	sign, s = s[0], s[1:]
      return sign + '0'*(width-n) + s
  
--- 319,323 ----
      sign = ''
      if s[0] in ('-', '+'):
!         sign, s = s[0], s[1:]
      return sign + '0'*(width-n) + s
  
***************
*** 334,343 ****
      res = line = ''
      for c in s:
! 	if c == '\t':
! 	    c = ' '*(tabsize - len(line) % tabsize)
! 	line = line + c
! 	if c == '\n':
! 	    res = res + line
! 	    line = ''
      return res + line
  
--- 334,343 ----
      res = line = ''
      for c in s:
!         if c == '\t':
!             c = ' '*(tabsize - len(line) % tabsize)
!         line = line + c
!         if c == '\n':
!             res = res + line
!             line = ''
      return res + line
  
***************
*** 388,399 ****
      """
      if len(fromstr) != len(tostr):
! 	raise ValueError, "maketrans arguments must have same length"
      global _idmapL
      if not _idmapL:
! 	_idmapL = map(None, _idmap)
      L = _idmapL[:]
      fromstr = map(ord, fromstr)
      for i in range(len(fromstr)):
! 	L[fromstr[i]] = tostr[i]
      return joinfields(L, "")
  
--- 388,399 ----
      """
      if len(fromstr) != len(tostr):
!         raise ValueError, "maketrans arguments must have same length"
      global _idmapL
      if not _idmapL:
!         _idmapL = map(None, _idmap)
      L = _idmapL[:]
      fromstr = map(ord, fromstr)
      for i in range(len(fromstr)):
!         L[fromstr[i]] = tostr[i]
      return joinfields(L, "")
  
***************
*** 429,431 ****
      letters = lowercase + uppercase
  except ImportError:
!     pass					  # Use the original versions
--- 429,431 ----
      letters = lowercase + uppercase
  except ImportError:
!     pass                                          # Use the original versions

Index: urllib2.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/urllib2.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** urllib2.py	2000/02/04 15:28:42	1.2
--- urllib2.py	2000/02/10 17:17:14	1.3
***************
*** 149,156 ****
      # the implementation.  need to override __init__ and __str__
      def __init__(self, reason):
! 	self.reason = reason
  
      def __str__(self):
! 	return '<urlopen error %s>' % self.reason
  
  class HTTPError(URLError, addinfourl):
--- 149,156 ----
      # the implementation.  need to override __init__ and __str__
[...1256 lines suppressed...]
!             return 1
      p = CustomProxy('http', at_cnri, 'proxy.cnri.reston.va.us')
      ph = CustomProxyHandler(p)
***************
*** 1053,1059 ****
              f = urlopen(url, req)
          except IOError, err:
! 	    print "IOError:", err
! 	except socket.error, err:
! 	    print "socket.error:", err
          else:
              buf = f.read()
--- 1053,1059 ----
              f = urlopen(url, req)
          except IOError, err:
!             print "IOError:", err
!         except socket.error, err:
!             print "socket.error:", err
          else:
              buf = f.read()

Index: whichdb.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/whichdb.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** whichdb.py	1999/06/08 13:13:16	1.5
--- whichdb.py	2000/02/10 17:17:14	1.6
***************
*** 57,61 ****
      # BSD hash v2 has a 12-byte NULL pad in front of the file type
      try:
! 	(magic,) = struct.unpack("=l", s16[-4:])
      except struct.error:
          return ""
--- 57,61 ----
      # BSD hash v2 has a 12-byte NULL pad in front of the file type
      try:
!         (magic,) = struct.unpack("=l", s16[-4:])
      except struct.error:
          return ""



From fdrake@weyr.cnri.reston.va.us  Thu Feb 10 17:23:46 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 10 Feb 2000 12:23:46 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src Makefile.in,1.81,1.82
Message-ID: <200002101723.MAA06689@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src
In directory weyr:/home/fdrake/projects/python

Modified Files:
	Makefile.in 
Log Message:

Enable -t when compiling Python library modules in libinstall (.pyc
version only).

Enable -tt for the regression test.

Very similar to Skip's patch.


Index: Makefile.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Makefile.in,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -r1.81 -r1.82
*** Makefile.in	1999/11/16 15:58:32	1.81
--- Makefile.in	2000/02/10 17:23:44	1.82
***************
*** 235,239 ****
  TESTOPTS=	
  TESTPROG=	$(srcdir)/Lib/test/regrtest.py
! TESTPYTHON=	./python$(EXE)
  test:		all
  		-rm -f $(srcdir)/Lib/test/*.py[co]
--- 235,239 ----
  TESTOPTS=	
  TESTPROG=	$(srcdir)/Lib/test/regrtest.py
! TESTPYTHON=	./python$(EXE) -tt
  test:		all
  		-rm -f $(srcdir)/Lib/test/*.py[co]
***************
*** 347,351 ****
  		done
  		PYTHONPATH=$(LIBDEST) \
! 			./python$(EXE) $(LIBDEST)/compileall.py $(LIBDEST)
  		PYTHONPATH=$(LIBDEST) \
  			./python$(EXE) -O $(LIBDEST)/compileall.py $(LIBDEST)
--- 347,351 ----
  		done
  		PYTHONPATH=$(LIBDEST) \
! 			./python$(EXE) -t $(LIBDEST)/compileall.py $(LIBDEST)
  		PYTHONPATH=$(LIBDEST) \
  			./python$(EXE) -O $(LIBDEST)/compileall.py $(LIBDEST)



From bwarsaw@cnri.reston.va.us  Thu Feb 10 20:25:56 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw)
Date: Thu, 10 Feb 2000 15:25:56 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib nntplib.py,1.17,1.18
Message-ID: <200002102025.PAA01706@anthem.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory anthem:/home/bwarsaw/projects/python/Lib

Modified Files:
	nntplib.py 
Log Message:
Added new exception classes:

    NNTPError - derived from Exception, it's the base class for all
    other exceptions in this module

    NNTPReplyError - what used to be error_reply

    NNTPTemporaryError - what used to be error_temp

    NNTPPermanentError - what used to be error_perm

    NNTPProtocolError - what used to be error_proto

    NNTPDataError - what used to be error_data

All the old names are retained for backwards compatibility; they point
to the class that replaces them.  Also, any code in this module that
raises an exception, now does so with the exception class.

NNTP.__init__(): Added a new optional argument `readermode', which is
a flag that defaults to false.  When set to true, the "mode reader"
command is sent to the NNTP server before user authentication.  Reader
mode is sometimes necessary if you are connecting to an NNTP server on
the local machine and intend to call reader-specific comamnds, such as
`group'.  If you get unexpected NNTPPermanentErrors, you might need to
set readermode.  Patch provided by Thomas Wouters (who include the
standard disclaimer on is patches@python.org submission), and inspired
by Jim Tittsler.


Index: nntplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/nntplib.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** nntplib.py	2000/02/04 15:10:33	1.17
--- nntplib.py	2000/02/10 20:25:53	1.18
***************
*** 35,46 ****
  
  
! # Exception raised when an error or invalid response is received
! error_reply = 'nntplib.error_reply'	# unexpected [123]xx reply
! error_temp = 'nntplib.error_temp'	# 4xx errors
! error_perm = 'nntplib.error_perm'	# 5xx errors
! error_proto = 'nntplib.error_proto'	# response does not begin with [1-5]
! error_data = 'nntplib.error_data'	# error in response data
  
  
  # Standard port used by NNTP servers
  NNTP_PORT = 119
--- 35,78 ----
  
  
! 
! # Exceptions raised when an error or invalid response is received
! class NNTPError(Exception):
! 	"""Base class for all nntplib exceptions"""
! 	def __init__(self, *args):
! 		apply(Exception.__init__, (self,)+args)
! 		try:
! 			self.response = args[0]
! 		except IndexError:
! 			self.response = 'No response given'
! 
! class NNTPReplyError(NNTPError):
! 	"""Unexpected [123]xx reply"""
! 	pass
! 
! class NNTPTemporaryError(NNTPError):
! 	"""4xx errors"""
! 	pass
! 
! class NNTPPermanentError(NNTPError):
! 	"""5xx errors"""
! 	pass
! 
! class NNTPProtocolError(NNTPError):
! 	"""Response does not begin with [1-5]"""
! 	pass
! 
! class NNTPDataError(NNTPError):
! 	"""Error in response data"""
! 	pass
! 
! # for backwards compatibility
! error_reply = NNTPReplyError
! error_temp = NNTPTemporaryError
! error_perm = NNTPPermanentError
! error_proto = NNTPProtocolError
! error_data = NNTPDataError
  
  
+ 
  # Standard port used by NNTP servers
  NNTP_PORT = 119
***************
*** 55,67 ****
  
  
  # The class itself
- 
  class NNTP:
! 
! 	def __init__(self, host, port = NNTP_PORT, user=None, password=None):
  		"""Initialize an instance.  Arguments:
  		- host: hostname to connect to
! 		- port: port to connect to (default the standard NNTP port)"""
! 
  		self.host = host
  		self.port = port
--- 87,109 ----
  
  
+ 
  # The class itself
  class NNTP:
! 	def __init__(self, host, port=NNTP_PORT, user=None, password=None,
! 		     readermode=None):
  		"""Initialize an instance.  Arguments:
  		- host: hostname to connect to
! 		- port: port to connect to (default the standard NNTP port)
! 		- user: username to authenticate with
! 		- password: password to use with username
! 		- readermode: if true, send 'mode reader' command after
! 		              connecting.
! 
! 	        readermode is sometimes necessary if you are connecting to an
! 	        NNTP server on the local machine and intend to call
! 	        reader-specific comamnds, such as `group'.  If you get
! 	        unexpected NNTPPermanentErrors, you might need to set
! 	        readermode.
! 		"""
  		self.host = host
  		self.port = port
***************
*** 71,84 ****
  		self.debugging = 0
  		self.welcome = self.getresp()
  		if user:
  			resp = self.shortcmd('authinfo user '+user)
  			if resp[:3] == '381':
  				if not password:
! 					raise error_reply, resp
  				else:
  					resp = self.shortcmd(
  						'authinfo pass '+password)
  					if resp[:3] != '281':
! 						raise error_perm, resp
  
  	def getwelcome(self):
--- 113,137 ----
  		self.debugging = 0
  		self.welcome = self.getresp()
+ 		if readermode:
+ 			try:
+ 				self.welcome = self.shortcmd('mode reader')
+ 			except NNTPPermanentError:
+ 				# error 500, probably 'not implemented'
+ 				pass
  		if user:
  			resp = self.shortcmd('authinfo user '+user)
  			if resp[:3] == '381':
  				if not password:
! 					raise NNTPReplyError(resp)
  				else:
  					resp = self.shortcmd(
  						'authinfo pass '+password)
  					if resp[:3] != '281':
! 						raise NNTPPermanentError(resp)
! 
! 	# Get the welcome message from the server
! 	# (this is read and squirreled away by __init__()).
! 	# If the response code is 200, posting is allowed;
! 	# if it 201, posting is not allowed
  
  	def getwelcome(self):
***************
*** 129,137 ****
  		c = resp[:1]
  		if c == '4':
! 			raise error_temp, resp
  		if c == '5':
! 			raise error_perm, resp
  		if c not in '123':
! 			raise error_proto, resp
  		return resp
  
--- 182,190 ----
  		c = resp[:1]
  		if c == '4':
! 			raise NNTPTemporaryError(resp)
  		if c == '5':
! 			raise NNTPPermanentError(resp)
  		if c not in '123':
! 			raise NNTPProtocolError(resp)
  		return resp
  
***************
*** 141,145 ****
  		resp = self.getresp()
  		if resp[:3] not in LONGRESP:
! 			raise error_reply, resp
  		list = []
  		while 1:
--- 194,198 ----
  		resp = self.getresp()
  		if resp[:3] not in LONGRESP:
! 			raise NNTPReplyError(resp)
  		list = []
  		while 1:
***************
*** 207,211 ****
  		resp = self.shortcmd('GROUP ' + name)
  		if resp[:3] <> '211':
! 			raise error_reply, resp
  		words = string.split(resp)
  		count = first = last = 0
--- 260,264 ----
  		resp = self.shortcmd('GROUP ' + name)
  		if resp[:3] <> '211':
! 			raise NNTPReplyError(resp)
  		words = string.split(resp)
  		count = first = last = 0
***************
*** 231,235 ****
  		"""Internal: parse the response of a STAT, NEXT or LAST command."""
  		if resp[:2] <> '22':
! 			raise error_reply, resp
  		words = string.split(resp)
  		nr = 0
--- 284,288 ----
  		"""Internal: parse the response of a STAT, NEXT or LAST command."""
  		if resp[:2] <> '22':
! 			raise NNTPReplyError(resp)
  		words = string.split(resp)
  		nr = 0
***************
*** 350,354 ****
  						    elem[7]))
  			except IndexError:
! 				raise error_data,line
  		return resp,xover_lines
  
--- 403,407 ----
  						    elem[7]))
  			except IndexError:
! 				raise NNTPDataError(line)
  		return resp,xover_lines
  
***************
*** 378,386 ****
  		resp = self.shortcmd("XPATH " + id)
  		if resp[:3] <> '223':
! 			raise error_reply, resp
  		try:
  			[resp_num, path] = string.split(resp)
  		except ValueError:
! 			raise error_reply, resp
  		else:
  			return resp, path
--- 431,439 ----
  		resp = self.shortcmd("XPATH " + id)
  		if resp[:3] <> '223':
! 			raise NNTPReplyError(resp)
  		try:
  			[resp_num, path] = string.split(resp)
  		except ValueError:
! 			raise NNTPReplyError(resp)
  		else:
  			return resp, path
***************
*** 396,407 ****
  		resp = self.shortcmd("DATE")
  		if resp[:3] <> '111':
! 			raise error_reply, resp
  		elem = string.split(resp)
  		if len(elem) != 2:
! 			raise error_data, resp
  		date = elem[1][2:8]
  		time = elem[1][-6:]
  		if len(date) != 6 or len(time) != 6:
! 			raise error_data, resp
  		return resp, date, time
  
--- 449,460 ----
  		resp = self.shortcmd("DATE")
  		if resp[:3] <> '111':
! 			raise NNTPReplyError(resp)
  		elem = string.split(resp)
  		if len(elem) != 2:
! 			raise NNTPDataError(resp)
  		date = elem[1][2:8]
  		time = elem[1][-6:]
  		if len(date) != 6 or len(time) != 6:
! 			raise NNTPDataError(resp)
  		return resp, date, time
  
***************
*** 416,420 ****
  		# Raises error_??? if posting is not allowed
  		if resp[0] <> '3':
! 			raise error_reply, resp
  		while 1:
  			line = f.readline()
--- 469,473 ----
  		# Raises error_??? if posting is not allowed
  		if resp[0] <> '3':
! 			raise NNTPReplyError(resp)
  		while 1:
  			line = f.readline()
***************
*** 440,444 ****
  		# Raises error_??? if the server already has it
  		if resp[0] <> '3':
! 			raise error_reply, resp
  		while 1:
  			line = f.readline()
--- 493,497 ----
  		# Raises error_??? if the server already has it
  		if resp[0] <> '3':
! 			raise NNTPReplyError(resp)
  		while 1:
  			line = f.readline()
***************
*** 466,470 ****
  def _test():
  	"""Minimal test function."""
! 	s = NNTP('news')
  	resp, count, first, last, name = s.group('comp.lang.python')
  	print resp
--- 519,523 ----
  def _test():
  	"""Minimal test function."""
! 	s = NNTP('news', readermode='reader')
  	resp, count, first, last, name = s.group('comp.lang.python')
  	print resp



From bwarsaw@cnri.reston.va.us  Thu Feb 10 20:26:47 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw)
Date: Thu, 10 Feb 2000 15:26:47 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libnntplib.tex,1.23,1.24
Message-ID: <200002102026.PAA01724@anthem.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory anthem:/home/bwarsaw/projects/python/Doc/lib

Modified Files:
	libnntplib.tex 
Log Message:
Document the API changes to the nntplib module (exceptions become
classes, NNTP.__init__() grows a new optional argument to set reader
mode on the server).


Index: libnntplib.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libnntplib.tex,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** libnntplib.tex	1999/04/22 16:45:26	1.23
--- libnntplib.tex	2000/02/10 20:26:45	1.24
***************
*** 54,58 ****
  
  \begin{classdesc}{NNTP}{host\optional{, port
!                         \optional{, user\optional{, password}}}}
  Return a new instance of the \class{NNTP} class, representing a
  connection to the NNTP server running on host \var{host}, listening at
--- 54,59 ----
  
  \begin{classdesc}{NNTP}{host\optional{, port
!                         \optional{, user\optional{, password
! 			\optional{, readermode}}}}}
  Return a new instance of the \class{NNTP} class, representing a
  connection to the NNTP server running on host \var{host}, listening at
***************
*** 60,82 ****
  \var{user} and \var{password} are provided, the
  \samp{AUTHINFO USER} and \samp{AUTHINFO PASS} commands are used to
! identify and authenticate the user to the server.
  \end{classdesc}
  
! \begin{excdesc}{error_reply}
! Exception raised when an unexpected reply is received from the server.
! \end{excdesc}
  
! \begin{excdesc}{error_temp}
! Exception raised when an error code in the range 400--499 is received.
! \end{excdesc}
  
! \begin{excdesc}{error_perm}
! Exception raised when an error code in the range 500--599 is received.
! \end{excdesc}
  
! \begin{excdesc}{error_proto}
  Exception raised when a reply is received from the server that does
! not begin with a digit in the range 1--5.
! \end{excdesc}
  
  
--- 61,108 ----
  \var{user} and \var{password} are provided, the
  \samp{AUTHINFO USER} and \samp{AUTHINFO PASS} commands are used to
! identify and authenticate the user to the server.  If the optional
! flag \var{readermode} is true, then a \samp{mode reader} command is
! sent before authentication is performed.  Reader mode is sometimes
! necessary if you are connecting to an NNTP server on the local machine
! and intend to call reader-specific commands, such as \samp{group}.  If
! you get unexpected \code{NNTPPermanentError}s, you might need to set
! \var{readermode}.  \var{readermode} defaults to \code{None}.
  \end{classdesc}
  
! \begin{classdesc}{NNTPError}{}
! Derived from the standard exception \code{Exception}, this is the base
! class for all exceptions raised by the \code{nntplib} module.
! \end{classdesc}
! 
! \begin{classdesc}{NNTPReplyError}{}
! Exception raised when an unexpected reply is received from the
! server.  For backwards compatibility, the exception \code{error_reply}
! is equivalent to this class.
! \end{classdesc}
  
! \begin{classdesc}{NNTPTemporaryError}{}
! Exception raised when an error code in the range 400--499 is
! received.  For backwards compatibility, the exception
! \code{error_temp} is equivalent to this class.
! \end{classdesc}
  
! \begin{classdesc}{NNTPPermanentError}{}
! Exception raised when an error code in the range 500--599 is
! received.  For backwards compatibility, the exception
! \code{error_perm} is equivalent to this class.
! \end{classdesc}
  
! \begin{classdesc}{NNTPProtocolError}{}
  Exception raised when a reply is received from the server that does
! not begin with a digit in the range 1--5.  For backwards
! compatibility, the exception \code{error_proto} is equivalent to this
! class.
! \end{classdesc}
! 
! \begin{classdesc}{NNTPDataError}{}
! Exception raised when there is some error in the response data.  For
! backwards compatibility, the exception \code{error_data} is
! equivalent to this class.
! \end{classdesc}
  
  



From a.eyre@optichrome.com  Fri Feb 11 11:32:44 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Fri, 11 Feb 2000 11:32:44 -0000
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <200002101621.LAA00758@weyr.cnri.reston.va.us>
Message-ID: <000a01bf7483$b6943fd0$3acbd9c2@peridot.optichrome.com>

> Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47

Is this module not obsolete now, seeing as how the string methods have
been added to the string type?



From gstein@lyra.org  Fri Feb 11 11:46:45 2000
From: gstein@lyra.org (Greg Stein)
Date: Fri, 11 Feb 2000 03:46:45 -0800 (PST)
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <000a01bf7483$b6943fd0$3acbd9c2@peridot.optichrome.com>
Message-ID: <Pine.LNX.4.10.10002110344550.4541-100000@nebula.lyra.org>

On Fri, 11 Feb 2000, Adrian Eyre wrote:
> > Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
> 
> Is this module not obsolete now, seeing as how the string methods have
> been added to the string type?

Nope. There are other things in there, such as string.whitespace or
string.letters that aren't found elsewhere. There are also some functions
such as string.ljust or string.center that were not converted to methods.

Then, of course, we have the whole issue of people importing string in
half the modules in existence :-) ... lots of backwards-compat to worry
about.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/



From a.eyre@optichrome.com  Fri Feb 11 12:03:18 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Fri, 11 Feb 2000 12:03:18 -0000
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <Pine.LNX.4.10.10002110344550.4541-100000@nebula.lyra.org>
Message-ID: <000e01bf7487$fc205e90$3acbd9c2@peridot.optichrome.com>

> Nope. There are other things in there, such as string.whitespace or
> string.letters that aren't found elsewhere. There are also some functions
> such as string.ljust or string.center that were not converted to methods.

Another thing. Why has string.join been added to the string object, when
it make so much more sense to add it to the list object. i.e.:

<list>.join() -> <string>
>>> ["one", "two", "three"].join(" ")	# " " would be default arg
'one two three'

rather than:

<string>.join(<list>) -> <string>
>>> " ".join(["one", "two", "three"])
'one two three'

I can just see this: " ".join(xxxx) notation appearing all over the place.

-----------------------------------------------------------------
Adrian Eyre <a.eyre@optichrome.com> - http://www.optichrome.com 



From a.eyre@optichrome.com  Fri Feb 11 12:15:42 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Fri, 11 Feb 2000 12:15:42 -0000
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <000e01bf7487$fc205e90$3acbd9c2@peridot.optichrome.com>
Message-ID: <001101bf7489$b733f380$3acbd9c2@peridot.optichrome.com>

> Another thing. Why has string.join been added to the string object, when
> it make so much more sense to add it to the list object. i.e.:

Actually, s/list/sequence/

>>> ["a", "b", "c"].join()
'a b c'
>>> ("a", "b", "c").join()
'a b c'
>>> "abc".join(", ")
'a, b, c'

-----------------------------------------------------------------
Adrian Eyre <a.eyre@optichrome.com> - http://www.optichrome.com 



From fredrik@pythonware.com  Fri Feb 11 12:30:28 2000
From: fredrik@pythonware.com (Fredrik Lundh)
Date: Fri, 11 Feb 2000 13:30:28 +0100
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
References: <001101bf7489$b733f380$3acbd9c2@peridot.optichrome.com>
Message-ID: <006901bf748b$dd2e2bd0$f29b12c2@secret.pythonware.com>

> > Another thing. Why has string.join been added to the string object, =
when
> > it make so much more sense to add it to the list object. i.e.:
>=20
> Actually, s/list/sequence/

what sequence object?

(there are hundreds of them, but just
two basic string types...)

</F>



From a.eyre@optichrome.com  Fri Feb 11 15:59:13 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Fri, 11 Feb 2000 15:59:13 -0000
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <006901bf748b$dd2e2bd0$f29b12c2@secret.pythonware.com>
Message-ID: <001701bf74a8$f10ef400$3acbd9c2@peridot.optichrome.com>

> what sequence object?

By sequence object, I meant any Python object that returns true on
a PySequence_Check(), indicating it can be safely cast to a
PySequenceObject.

I figured that this applies to lists, tuples and strings. See
previous post for examples.

> (there are hundreds of them, but just two basic string types...)

Two? I'm confused now...

Unless you mean char/Unicode.

Besides, I don't see the connection...



From fredrik@pythonware.com  Fri Feb 11 16:55:59 2000
From: fredrik@pythonware.com (Fredrik Lundh)
Date: Fri, 11 Feb 2000 17:55:59 +0100
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
References: <001701bf74a8$f10ef400$3acbd9c2@peridot.optichrome.com>
Message-ID: <003001bf74b0$dfde09c0$f29b12c2@secret.pythonware.com>

> By sequence object, I meant any Python object that returns true on
> a PySequence_Check()

are we talking about the same language?

PySequence_Check checks if an object can be used as
a sequence.

> indicating it can be safely cast to a PySequenceObject.

there is no such thing as a PySequenceObject.

> I figured that this applies to lists, tuples and strings. See
> previous post for examples.

and even if it were, who would do the casting?

> > (there are hundreds of them, but just two basic string types...)
>=20
> Two? I'm confused now...

obviously ;-)

> Besides, I don't see the connection...

you will.  you will.

</F>



From a.eyre@optichrome.com  Fri Feb 11 17:32:53 2000
From: a.eyre@optichrome.com (Adrian Eyre)
Date: Fri, 11 Feb 2000 17:32:53 -0000
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <14500.17239.912973.801205@anthem.cnri.reston.va.us>
Message-ID: <000201bf74b6$06e9d1c0$3acbd9c2@peridot.optichrome.com>

>     AE> I figured that this applies to lists, tuples and strings. See
>     AE> previous post for examples.
> 
> And any class that acts like a sequence has to implement a join()
> method too.

If they want to override the default.

Assuming format:

<sequence>.join(separator = " ") -> <string>

The default would be something like:


PyObject* PySequence_Join(PyObject* self, PyObject* args)
{
	char* sep = " ";
	int len, idx;
	PyObject* str, result, pysep;

	assert(PySequence_Check(self)); /* not sure if this is needed */

	if (!PyArg_ParseTuple(args, "|s", &sep))
		return NULL;

	pysep = PyString_FromString(sep);
	result = PyString_New();

	len = PyObject_Length(self);
	for (idx = 0; idx < len; idx++)
	{
		str = PyObject_Str(PySequence_GetItem(self, idx));
		PyString_ConcatAndDel(result, str);
		if (idx != len)
			PyString_Concat(result, pysep);
	}

	Py_DECREF(pysep);

	return result;
}

So, providing their sequence implements getitem, and items can
be stringified, they won't need to override the default.

-----------------------------------------------------------------
Adrian Eyre <a.eyre@optichrome.com> - http://www.optichrome.com 



From bwarsaw@cnri.reston.va.us (Barry A. Warsaw)  Fri Feb 11 17:13:59 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw) (Barry A. Warsaw)
Date: Fri, 11 Feb 2000 12:13:59 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
References: <006901bf748b$dd2e2bd0$f29b12c2@secret.pythonware.com>
 <001701bf74a8$f10ef400$3acbd9c2@peridot.optichrome.com>
Message-ID: <14500.17239.912973.801205@anthem.cnri.reston.va.us>

>>>>> "AE" == Adrian Eyre <a.eyre@optichrome.com> writes:

    AE> By sequence object, I meant any Python object that returns
    AE> true on a PySequence_Check(), indicating it can be safely cast
    AE> to a PySequenceObject.

    AE> I figured that this applies to lists, tuples and strings. See
    AE> previous post for examples.

And any class that acts like a sequence has to implement a join()
method too.

-Barry


From Fredrik Lundh" <effbot@telia.com  Fri Feb 11 19:43:21 2000
From: Fredrik Lundh" <effbot@telia.com (Fredrik Lundh)
Date: Fri, 11 Feb 2000 20:43:21 +0100
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
References: <000201bf74b6$06e9d1c0$3acbd9c2@peridot.optichrome.com>
Message-ID: <02e501bf74c8$42fb2620$34aab5d4@hagrid>

Adrian Eyre <a.eyre@optichrome.com> wrote:
> >     AE> I figured that this applies to lists, tuples and strings. =
See
> >     AE> previous post for examples.
> >=20
> > And any class that acts like a sequence has to implement a join()
> > method too.
>=20
> If they want to override the default.

you're still confused.  "act like a sequence" is defined
by an interface, not a base class.  there is no default.

go study the sources, and you will understand.

</F>



From fdrake@weyr.cnri.reston.va.us  Fri Feb 11 19:38:05 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 11 Feb 2000 14:38:05 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/texinputs boilerplate.tex,1.37,1.37.2.1
Message-ID: <200002111938.OAA13822@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/texinputs
In directory weyr:/home/fdrake/projects/python/Doc-152p1/texinputs

Modified Files:
      Tag: release152p1-patches
	boilerplate.tex 
Log Message:

Per the consortium notes, Guido's address should be presented as
guido@python.org; drop the CNRI address.


Index: boilerplate.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/texinputs/boilerplate.tex,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -C2 -r1.37 -r1.37.2.1
*** boilerplate.tex	1999/07/02 15:27:14	1.37
--- boilerplate.tex	2000/02/11 19:38:02	1.37.2.1
***************
*** 4,10 ****
  	Corporation for National Research Initiatives (CNRI) \\
  	1895 Preston White Drive, Reston, Va 20191, USA \\
! 	E-mail: \email{guido@CNRI.Reston.Va.US}, \email{guido@python.org}
  }
  
! \date{July 6, 1999}			% XXX update before release!
  \release{1.5.2}
--- 4,10 ----
  	Corporation for National Research Initiatives (CNRI) \\
  	1895 Preston White Drive, Reston, Va 20191, USA \\
! 	E-mail: \email{guido@python.org}
  }
  
! \date{March 17, 2000}			% XXX update before release!
  \release{1.5.2}



From Gerrit <gerrit@nl.linux.org>  Fri Feb 11 20:43:05 2000
From: Gerrit <gerrit@nl.linux.org> (Gerrit Holl)
Date: Fri, 11 Feb 2000 21:43:05 +0100
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
In-Reply-To: <02e501bf74c8$42fb2620$34aab5d4@hagrid>; from effbot@telia.com on Fri, Feb 11, 2000 at 08:43:21PM +0100
References: <000201bf74b6$06e9d1c0$3acbd9c2@peridot.optichrome.com> <02e501bf74c8$42fb2620$34aab5d4@hagrid>
Message-ID: <20000211214305.A7503@stopcontact.palga.uucp>

Hello,

Fredrik Lundh wrote on 950298201:
> Adrian Eyre <a.eyre@optichrome.com> wrote:
> > >     AE> I figured that this applies to lists, tuples and strings. See
> > >     AE> previous post for examples.
> > > 
> > > And any class that acts like a sequence has to implement a join()
> > > method too.
> > 
> > If they want to override the default.
> 
> you're still confused.  "act like a sequence" is defined
> by an interface, not a base class.  there is no default.
> 
> go study the sources, and you will understand.

Can you please discuss this somewhere else?
Either on python-dev, where I don't see it this obvious,
or on python-list, where I can contribute in the discussion.
I get frustated when I follow a discussion which I can't join!

I want to say that if types will eventually be classes in the Far Future,
a SequenceType could be implemented.

regards,
Gerrit.

-- 
Homepage: http://www.nl.linux.org/~gerrit
-----BEGIN GEEK CODE BLOCK----- http://www.geekcode.com
Version: 3.12
GCS dpu s-:-- a14 C++++>$ UL++ P--- L+++ E--- W++ N o? K? w--- !O
!M !V PS+ PE? Y? PGP-- t- 5? X? R- tv- b+(++) DI D+ G++ !e !r !y
-----END GEEK CODE BLOCK----- moc.edockeeg.www//:ptth


From Fredrik Lundh" <effbot@telia.com  Fri Feb 11 21:59:13 2000
From: Fredrik Lundh" <effbot@telia.com (Fredrik Lundh)
Date: Fri, 11 Feb 2000 22:59:13 +0100
Subject: [Python-checkins] CVS: python/dist/src/Lib string.py,1.46,1.47
References: <000201bf74b6$06e9d1c0$3acbd9c2@peridot.optichrome.com> <02e501bf74c8$42fb2620$34aab5d4@hagrid> <20000211214305.A7503@stopcontact.palga.uucp>
Message-ID: <005f01bf74db$3d51e3e0$34aab5d4@hagrid>

Gerrit Holl <gerrit.holl@pobox.com> wrote:
> Can you please discuss this somewhere else?
> Either on python-dev, where I don't see it this obvious,
> or on python-list, where I can contribute in the discussion.
> I get frustated when I follow a discussion which I can't join!

sure looks like you just joined it.

> I want to say that if types will eventually be classes in the Far =
Future,
> a SequenceType could be implemented.

yeah, but eventually is not good enough in this case; the
string methods are already checked into the current CVS
version.

</F>



From guido@cnri.reston.va.us  Mon Feb 14 17:58:28 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 14 Feb 2000 12:58:28 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python dynload_mac.c,2.2,2.3
Message-ID: <200002141758.MAA21253@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory eric:/projects/python/develop/guido/src/Python

Modified Files:
	dynload_mac.c 
Log Message:
Patch by Jack Jansen:

If we attempt to import a dynamic module in a newer (or older) version
of Python give an error message tailored to the situation (Python too
new/old).


Index: dynload_mac.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/dynload_mac.c,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -r2.2 -r2.3
*** dynload_mac.c	1999/12/22 14:09:35	2.2
--- dynload_mac.c	2000/02/14 17:58:25	2.3
***************
*** 115,118 ****
--- 115,130 ----
  			      kLoadCFrag, &connID, &mainAddr,
  			      errMessage);
+ 	if ( err == cfragImportTooOldErr || err == cfragImportTooNewErr ) {
+ 		/*
+ 		** Special-case code: if PythonCore is too old or too new this means
+ 		** the dynamic module was meant for a different Python.
+ 		*/
+ 		if (errMessage[0] == 10 && strncmp((char *)errMessage+1, "PythonCore", 10) == 0 ) {
+ 			sprintf(buf, "Dynamic module was built for %s version of MacPython",
+ 				(err == cfragImportTooOldErr ? "a newer" : "an older"));
+ 			PyErr_SetString(PyExc_ImportError, buf);
+ 			return NULL;
+ 		}
+ 	}
  	if ( err ) {
  		sprintf(buf, "%.*s: %.200s",



From fdrake@weyr.cnri.reston.va.us  Mon Feb 14 21:30:55 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 14 Feb 2000 16:30:55 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib colorsys.py,1.3,1.4
Message-ID: <200002142130.QAA19401@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	colorsys.py 
Log Message:

Fix the question marks next to the expansions of some of the
colorspace name abbreviations, based on email from Gerrit Holl
<gerrit.holl@pobox.com>.


Index: colorsys.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/colorsys.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** colorsys.py	1999/02/25 14:26:02	1.3
--- colorsys.py	2000/02/14 21:30:52	1.4
***************
*** 12,17 ****
  RGB: Red, Green, Blue components
  YIQ: used by composite video signals
! HLS: Hue, Luminance, S???
! HSV: Hue, Saturation, Value(?)
  """
  # References:
--- 12,17 ----
  RGB: Red, Green, Blue components
  YIQ: used by composite video signals
! HLS: Hue, Luminance, Saturation
! HSV: Hue, Saturation, Value
  """
  # References:



From guido@cnri.reston.va.us  Mon Feb 14 21:41:53 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 14 Feb 2000 16:41:53 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts logmerge.py,1.4,1.5
Message-ID: <200002142141.QAA22383@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Modified Files:
	logmerge.py 
Log Message:
Patch by Gerrit Holl:

    * In logmerge.py: added '-r' flag to show the oldest checkin
      first instead of the newest, and getopt.getopt was used
      wrong.


Index: logmerge.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/scripts/logmerge.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** logmerge.py	1998/03/24 05:30:25	1.4
--- logmerge.py	2000/02/14 21:41:50	1.5
***************
*** 33,40 ****
      """Main program"""
      truncate_last = 0
!     opts, args = getopt.getopt(sys.argv[1:], "-t")
      for o, a in opts:
          if o == '-t':
              truncate_last = 1
      database = []
      while 1:
--- 33,43 ----
      """Main program"""
      truncate_last = 0
!     reverse = 0
!     opts, args = getopt.getopt(sys.argv[1:], "tr")
      for o, a in opts:
          if o == '-t':
              truncate_last = 1
+         elif o == '-r':
+             reverse = 1
      database = []
      while 1:
***************
*** 47,51 ****
          database[len(database):] = records
      database.sort()
!     database.reverse()
      format_output(database)
  
--- 50,55 ----
          database[len(database):] = records
      database.sort()
!     if not reverse:
!         database.reverse()
      format_output(database)
  



From guido@cnri.reston.va.us  Mon Feb 14 21:42:17 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 14 Feb 2000 16:42:17 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts crlf.py,1.1,1.2 lfcr.py,1.2,1.3
Message-ID: <200002142142.QAA22408@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Modified Files:
	crlf.py lfcr.py 
Log Message:
Patch by Gerrit Holl:

* In crlf.py and lfcr.py: regsub -> re



Index: crlf.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/scripts/crlf.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** crlf.py	1998/09/14 15:46:41	1.1
--- crlf.py	2000/02/14 21:42:14	1.2
***************
*** 3,7 ****
  "Replace CRLF with LF in argument files.  Print names of changed files."
  
! import sys, regsub, os
  for file in sys.argv[1:]:
      if os.path.isdir(file):
--- 3,7 ----
  "Replace CRLF with LF in argument files.  Print names of changed files."
  
! import sys, re, os
  for file in sys.argv[1:]:
      if os.path.isdir(file):
***************
*** 12,16 ****
          print file, "Binary!"
          continue
!     newdata = regsub.gsub("\r\n", "\n", data)
      if newdata != data:
          print file
--- 12,16 ----
          print file, "Binary!"
          continue
!     newdata = re.sub("\r\n", "\n", data)
      if newdata != data:
          print file

Index: lfcr.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/scripts/lfcr.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lfcr.py	1998/09/14 15:56:40	1.2
--- lfcr.py	2000/02/14 21:42:14	1.3
***************
*** 3,7 ****
  "Replace LF with CRLF in argument files.  Print names of changed files."
  
! import sys, regsub, os
  for file in sys.argv[1:]:
      if os.path.isdir(file):
--- 3,7 ----
  "Replace LF with CRLF in argument files.  Print names of changed files."
  
! import sys, re, os
  for file in sys.argv[1:]:
      if os.path.isdir(file):
***************
*** 12,16 ****
          print file, "Binary!"
          continue
!     newdata = regsub.gsub("\r?\n", "\r\n", data)
      if newdata != data:
          print file
--- 12,16 ----
          print file, "Binary!"
          continue
!     newdata = re.sub("\r?\n", "\r\n", data)
      if newdata != data:
          print file



From fdrake@weyr.cnri.reston.va.us  Mon Feb 14 21:52:19 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 14 Feb 2000 16:52:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libstdtypes.tex,1.20.2.2,1.20.2.3
Message-ID: <200002142152.QAA19987@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libstdtypes.tex 
Log Message:

Per a suggestion from Gerrit Holl <gerrit.holl@pobox.com>, note that
<> is obsolescent.  This mirrors a comment added to the language ref
by Guido in June, 1998.  Mostly because nobody reads the language ref
anymore.  ;[


Index: libstdtypes.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libstdtypes.tex,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -C2 -r1.20.2.2 -r1.20.2.3
*** libstdtypes.tex	2000/01/20 15:33:24	1.20.2.2
--- libstdtypes.tex	2000/02/14 21:52:16	1.20.2.3
***************
*** 124,127 ****
--- 124,128 ----
  \index{language!ABC@\ABC{}}
  \indexii{C@\C{}}{language}
+ \code{!=} is the preferred spelling; \code{<>} is obsolescent.
  
  \end{description}



From fdrake@weyr.cnri.reston.va.us  Mon Feb 14 22:17:11 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 14 Feb 2000 17:17:11 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
Message-ID: <200002142217.RAA20106@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libcrypt.tex 
Log Message:

Revisions and example from Peter Funk <pf@artcom-gmbh.de>.


Index: libcrypt.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libcrypt.tex,v
retrieving revision 1.14
retrieving revision 1.14.4.1
diff -C2 -r1.14 -r1.14.4.1
*** libcrypt.tex	1999/03/02 17:03:35	1.14
--- libcrypt.tex	2000/02/14 22:17:08	1.14.4.1
***************
*** 1,28 ****
  \section{\module{crypt} ---
!          Function used to check \UNIX{} passwords}
  
  \declaremodule{builtin}{crypt}
    \platform{Unix}
! \modulesynopsis{The \cfunction{crypt()} function used to check \UNIX{}
!   passwords.}
  \moduleauthor{Steven D. Majewski}{sdm7g@virginia.edu}
  \sectionauthor{Steven D. Majewski}{sdm7g@virginia.edu}
  
  
! This module implements an interface to the \manpage{crypt}{3} routine,
! which is a one-way hash function based upon a modified DES algorithm;
! see the \UNIX{} man page for further details.  Possible uses include
  allowing Python scripts to accept typed passwords from the user, or
  attempting to crack \UNIX{} passwords with a dictionary.
- \index{crypt(3)}
  
  \begin{funcdesc}{crypt}{word, salt} 
! \var{word} will usually be a user's password.  \var{salt} is a
! 2-character string which will be used to select one of 4096 variations
! of DES\indexii{cipher}{DES}.  The characters in \var{salt} must be
! either \character{.}, \character{/}, or an alphanumeric character.
! Returns the hashed password as a string, which will be composed of
! characters from the same alphabet as the salt.
  \end{funcdesc}
  
  The module and documentation were written by Steve Majewski.
--- 1,44 ----
  \section{\module{crypt} ---
!          Function to check \UNIX{} passwords}
  
  \declaremodule{builtin}{crypt}
    \platform{Unix}
! \modulesynopsis{The \cfunction{crypt()} function used to check
!   \UNIX{} passwords.}
  \moduleauthor{Steven D. Majewski}{sdm7g@virginia.edu}
  \sectionauthor{Steven D. Majewski}{sdm7g@virginia.edu}
  
  
! This module implements an interface to the
! \manpage{crypt}{3}\index{crypt(3)} routine, which is a one-way hash
! function based upon a modified DES\indexii{cipher}{DES} algorithm; see
! the \UNIX{} man page for further details.  Possible uses include
  allowing Python scripts to accept typed passwords from the user, or
  attempting to crack \UNIX{} passwords with a dictionary.
  
  \begin{funcdesc}{crypt}{word, salt} 
! \var{word} will usually be a user's password as typed at a prompt or
! in a graphical interface.  \var{salt} is usually a random
! two-character string which will be used to perturb the DES algorithm
! in one of 4096 ways.  The characters in \var{salt} must be in the set
! \regexp{[./a-zA-Z0-9]}.  Returns the hashed password as a string,
! which will be composed of characters from the same alphabet as the
! salt (the first two characters represent the salt itself).
  \end{funcdesc}
+ 
+ 
+ A simple example illustrating typical use:
+ 
+ \begin{verbatim}
+ import crypt, getpass, pwd
+ def login():
+     username = raw_input('Python login:')
+     cryptedpasswd = pwd.getpwnam(username)[1]
+     if cryptedpasswd:
+         if cryptedpasswd == 'x' or cryptedpasswd == '*': 
+             raise "Sorry, currently no support for shadow passwords"
+         cleartext = getpass.getpass()
+         return crypt(cleartext, cryptedpasswd[0:2]) == cryptedpasswd
+ \end{verbatim}
  
  The module and documentation were written by Steve Majewski.



From akuchlin@CNRI.Reston.VA.US  Mon Feb 14 22:22:08 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Mon, 14 Feb 2000 17:22:08 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects abstract.c,2.28,2.29
Message-ID: <200002142222.RAA19507@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory amarok:/home/akuchlin/src/Python-1.5/Objects

Modified Files:
	abstract.c 
Log Message:
Make multiplying a sequence by a long integer (5L * 'b') legal


Index: abstract.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/abstract.c,v
retrieving revision 2.28
retrieving revision 2.29
diff -C2 -r2.28 -r2.29
*** abstract.c	1999/10/12 19:54:47	2.28
--- abstract.c	2000/02/14 22:22:04	2.29
***************
*** 385,392 ****
  	m = tp->tp_as_sequence;
  	if (m && m->sq_repeat) {
! 		if (!PyInt_Check(w))
  			return type_error(
  				"can't multiply sequence with non-int");
! 		return (*m->sq_repeat)(v, (int)PyInt_AsLong(w));
  	}
  	return type_error("bad operand type(s) for *");
--- 385,403 ----
  	m = tp->tp_as_sequence;
  	if (m && m->sq_repeat) {
! 		long mul_value;
! 
! 		if (PyInt_Check(w)) {
! 			mul_value = PyInt_AsLong(w);
! 		}
! 		else if (PyLong_Check(w)) {
! 			mul_value = PyLong_AsLong(w);
! 			if (PyErr_Occurred())
!                                 return NULL; 
! 		}
! 		else {
  			return type_error(
  				"can't multiply sequence with non-int");
! 		}
! 		return (*m->sq_repeat)(v, (int)mul_value);
  	}
  	return type_error("bad operand type(s) for *");



From Fredrik Lundh" <effbot@telia.com  Mon Feb 14 22:39:47 2000
From: Fredrik Lundh" <effbot@telia.com (Fredrik Lundh)
Date: Mon, 14 Feb 2000 23:39:47 +0100
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
References: <200002142217.RAA20106@weyr.cnri.reston.va.us>
Message-ID: <007a01bf773c$66342620$34aab5d4@hagrid>

mr. nitpicker strikes again:

> + \begin{verbatim}
> + import crypt, getpass, pwd
> + def login():
> +     username =3D raw_input('Python login:')
> +     cryptedpasswd =3D pwd.getpwnam(username)[1]
> +     if cryptedpasswd:

shouldn't this function return true if the
password is not required?

> +         if cryptedpasswd =3D=3D 'x' or cryptedpasswd =3D=3D '*':=20

in ("x", "*"):

> +             raise "Sorry, currently no support for shadow passwords"
> +         cleartext =3D getpass.getpass()
> +         return crypt(cleartext, cryptedpasswd[0:2]) =3D=3D =
cryptedpasswd

return crypt.crypt(cleartext, cryptedpasswd[:2]) =3D=3D cryptedpasswd

> + \end{verbatim}
>  =20
>   The module and documentation were written by Steve Majewski,

with additions by Peter Funk.

</F>



From pf@artcom-gmbh.de  Tue Feb 15 00:37:33 2000
From: pf@artcom-gmbh.de (Peter Funk)
Date: Tue, 15 Feb 2000 01:37:33 +0100 (MET)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
In-Reply-To: <007a01bf773c$66342620$34aab5d4@hagrid> from Fredrik Lundh at "Feb 14, 2000 11:39:47 pm"
Message-ID: <m12KVzh-000Cw3C@artcom0.artcom-gmbh.de>

Hi!

Fredrik Lundh wrote:
> mr. nitpicker strikes again:
> 
> > + \begin{verbatim}
> > + import crypt, getpass, pwd
> > + def login():
> > +     username = raw_input('Python login:')
> > +     cryptedpasswd = pwd.getpwnam(username)[1]
> > +     if cryptedpasswd:
> 
> shouldn't this function return true if the
> password is not required?

Yes.  Indeed.

> > +         if cryptedpasswd == 'x' or cryptedpasswd == '*': 
> 
> in ("x", "*"):

I must have programmed in Modula-2 and C for too long. :-(

> > +             raise "Sorry, currently no support for shadow passwords"
> > +         cleartext = getpass.getpass()
> > +         return crypt(cleartext, cryptedpasswd[0:2]) == cryptedpasswd
> 
> return crypt.crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd

Argg... :-(

> > + \end{verbatim}
> >   
> >   The module and documentation were written by Steve Majewski,
> 
> with additions by Peter Funk.

I hadn't imagined, that I could submit so many bad lines in such a
short example. :-(  I will try to prepare my next patches more
carefully!  Thanks Fredrik.

Regards, Peter
-- 
Peter Funk, Oldenburger Str.86, 27777 Ganderkesee, Tel: 04222 9502 70, Fax: -60


From gstein@lyra.org  Tue Feb 15 01:17:17 2000
From: gstein@lyra.org (Greg Stein)
Date: Mon, 14 Feb 2000 17:17:17 -0800 (PST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
In-Reply-To: <m12KVzh-000Cw3C@artcom0.artcom-gmbh.de>
Message-ID: <Pine.LNX.4.10.10002141714570.7924-100000@nebula.lyra.org>

On Tue, 15 Feb 2000, Peter Funk wrote:
> Fredrik Lundh wrote:
>...
> > > +         if cryptedpasswd == 'x' or cryptedpasswd == '*': 
> > 
> > in ("x", "*"):
> 
> I must have programmed in Modula-2 and C for too long. :-(

Actually, it is arguable which is faster. Using the "in" form means that
you construct the tuple at runtime, then perform the "in" check. The
version using "or" is simply a couple comparisons.

In other words, it really comes down to which form is most readable. I
think Peter's original form using "or" is more readable. Fredrik's is
easier to extend to include more alternatives. Your call :-)

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/



From guido@cnri.reston.va.us  Tue Feb 15 14:51:48 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 09:51:48 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects intobject.c,2.37,2.38
Message-ID: <200002151451.JAA23209@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	intobject.c 
Log Message:
In response to one particular complaint on edu-sig, change some error
messages from "OverflowError: integer pow()" to "OverflowError:
integer exponentiation".  (Not that this takes care of the complaint
in general that the error messages could be greatly improved. :-)


Index: intobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/intobject.c,v
retrieving revision 2.37
retrieving revision 2.38
diff -C2 -r2.37 -r2.38
*** intobject.c	2000/01/20 22:32:54	2.37
--- intobject.c	2000/02/15 14:51:46	2.38
***************
*** 578,582 ****
  				break; /* Avoid ix / 0 */
  			if (ix / temp != prev)
! 				return err_ovf("integer pow()");
  		}
  	 	iw >>= 1;	/* Shift exponent down by 1 bit */
--- 578,582 ----
  				break; /* Avoid ix / 0 */
  			if (ix / temp != prev)
! 				return err_ovf("integer exponentiation");
  		}
  	 	iw >>= 1;	/* Shift exponent down by 1 bit */
***************
*** 585,589 ****
  	 	temp *= temp;	/* Square the value of temp */
  	 	if (prev!=0 && temp/prev!=prev)
! 			return err_ovf("integer pow()");
  	 	if (iz) {
  			/* If we did a multiplication, perform a modulo */
--- 585,589 ----
  	 	temp *= temp;	/* Square the value of temp */
  	 	if (prev!=0 && temp/prev!=prev)
! 			return err_ovf("integer exponentiation");
  	 	if (iz) {
  			/* If we did a multiplication, perform a modulo */
***************
*** 631,635 ****
  			break; /* 0 to some power -- avoid ix / 0 */
  		if (ix / iv != prev)
! 			return err_ovf("integer pow()");
  	}
  	return PyInt_FromLong(ix);
--- 631,635 ----
  			break; /* 0 to some power -- avoid ix / 0 */
  		if (ix / iv != prev)
! 			return err_ovf("integer exponentiation");
  	}
  	return PyInt_FromLong(ix);



From guido@cnri.reston.va.us  Tue Feb 15 17:15:39 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 12:15:39 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle TODO.txt,1.11,1.12
Message-ID: <200002151715.MAA24003@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	TODO.txt 
Log Message:
Tiny addition.


Index: TODO.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/TODO.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** TODO.txt	1999/09/09 14:16:02	1.11
--- TODO.txt	2000/02/15 17:15:36	1.12
***************
*** 31,35 ****
  - make backups when saving
  - check file mtimes at various points
! - interface with RCS/CVS/Perforce ???
  - status bar???
  - better help?
--- 31,35 ----
  - make backups when saving
  - check file mtimes at various points
! - Pluggable interface with RCS/CVS/Perforce/Clearcase
  - status bar???
  - better help?



From guido@cnri.reston.va.us  Tue Feb 15 17:16:42 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 12:16:42 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle README.txt,1.6,1.7
Message-ID: <200002151716.MAA24025@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	README.txt 
Log Message:
Updated for pending IDLE 0.5 release (still very rough -- just getting
it out in a more convenient format than CVS).



Index: README.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/README.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** README.txt	1999/04/07 18:41:59	1.6
--- README.txt	2000/02/15 17:16:40	1.7
***************
*** 1,4 ****
! IDLE 0.4 - 7 April 1999
! -----------------------
  
  For news about this release, see the file NEWS.txt.  (For a more
--- 1,4 ----
! IDLE 0.5 - February 2000
! ------------------------
  
  For news about this release, see the file NEWS.txt.  (For a more
***************
*** 14,20 ****
  - works on Windows and Unix (probably works on Mac too)
  
! The main program is in the file "idle"; on Windows you can use idle.pyw
! to avoid popping up a DOS console.  Any arguments passed are interpreted
! as files that will be opened for editing.
  
  IDLE requires Python 1.5.2, so it is currently only usable with the
--- 14,20 ----
  - works on Windows and Unix (probably works on Mac too)
  
! The main program is in the file "idle"; on Windows you can use
! idle.pyw to avoid popping up a DOS console.  Any arguments passed are
! interpreted as files that will be opened for editing.
  
  IDLE requires Python 1.5.2, so it is currently only usable with the



From guido@cnri.reston.va.us  Tue Feb 15 17:18:00 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 12:18:00 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle NEWS.txt,1.3,1.4
Message-ID: <200002151718.MAA24046@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	NEWS.txt 
Log Message:
News update.  Probably incomplete; what else is new?


Index: NEWS.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/NEWS.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** NEWS.txt	1999/04/07 18:41:58	1.3
--- NEWS.txt	2000/02/15 17:17:58	1.4
***************
*** 3,6 ****
--- 3,33 ----
  ----------------------------------------------------------------------
  
+ New in IDLE 0.5 (2/14/2000)
+ -------------------------
+ 
+ Tons of stuff, much of it contributed by Tim Peters and Mark Hammond:
+ 
+ - Format paragraph now recognizes Python block comments and reformats
+ them correctly (MH)
+ 
+ - New version of pyclbr.py parses top-level functions and understands
+ much more of Python's syntax; this is reflected in the class and path
+ browsers (TP)
+ 
+ - Much better auto-indent; knows how to indent the insides of
+ multi-line statements (TP)
+ 
+ - Call tip window pops up when you type the name of a known function
+ followed by an open parenthesis (MH)
+ 
+ - Comment out region now inserts ## to make it stand out more (TP)
+ 
+ - New path and class browsers based on a tree widget that looks
+ familiar to Windows users
+ 
+ - Reworked script running commands to be more intuitive
+ 
+ - XXX much more?!
+ 
  New in IDLE 0.4 (4/7/99)
  ------------------------



From guido@cnri.reston.va.us  Tue Feb 15 17:19:28 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 12:19:28 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle ChangeLog,1.3,1.4
Message-ID: <200002151719.MAA24089@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	ChangeLog 
Log Message:
Updated change log.


Index: ChangeLog
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ChangeLog	1999/04/26 22:20:38	1.3
--- ChangeLog	2000/02/15 17:19:25	1.4
***************
*** 1,2 ****
--- 1,436 ----
+ Tue Feb 15 17:17:58 2000  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* NEWS.txt: News update.  Probably incomplete; what else is new?
+ 
+ 	* README.txt:
+ 	Updated for pending IDLE 0.5 release (still very rough -- just getting
+ 	it out in a more convenient format than CVS).
+ 
+ 	* TODO.txt: Tiny addition.
+ 
+ Thu Sep  9 14:16:02 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* TODO.txt: A few new TODO entries.
+ 
+ Thu Aug 26 23:06:22 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* Bindings.py: Add Python Documentation entry to Help menu.
+ 
+ 	* EditorWindow.py:
+ 	Find the help.txt file relative to __file__ or ".", not in sys.path.
+ 	(Suggested by Moshe Zadka, but implemented differently.)
+ 
+ 	Add <<python-docs>> event which, on Unix, brings up Netscape pointing
+ 	to http://www.python.doc/current/ (a local copy would be nice but its
+ 	location can't be predicted).  Windows solution TBD.
+ 
+ Wed Aug 11 14:55:43 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* TreeWidget.py:
+ 	Moshe noticed an inconsistency in his comment, so I'm rephrasing it to
+ 	be clearer.
+ 
+ 	* TreeWidget.py:
+ 	Patch inspired by Moshe Zadka to search for the Icons directory in the
+ 	same directory as __file__, rather than searching for it along sys.path.
+ 	This works better when idle is a package.
+ 
+ Thu Jul 15 13:11:02 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* TODO.txt: New wishes.
+ 
+ Sat Jul 10 13:17:35 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* IdlePrefs.py:
+ 	Make the color for stderr red (i.e. the standard warning/danger/stop
+ 	color) rather than green.  Suggested by Sam Schulenburg.
+ 
+ Fri Jun 25 17:26:34 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* PyShell.py: Close debugger when closing.  This may break a cycle.
+ 
+ 	* Debugger.py: Break cycle on close.
+ 
+ 	* ClassBrowser.py: Destroy the tree when closing.
+ 
+ 	* TreeWidget.py: Add destroy() method to recursively destroy a tree.
+ 
+ 	* PyShell.py: Extend _close() to break cycles.
+ 	Break some other cycles too (and destroy the root when done).
+ 
+ 	* EditorWindow.py:
+ 	Add _close() method that does the actual cleanup (close() asks the
+ 	user what they want first if there's unsaved stuff, and may cancel).
+ 	It closes more than before.
+ 
+ 	Add unload_extensions() method to unload all extensions; called from
+ 	_close().  It calls an extension's close() method if it has one.
+ 
+ 	* Percolator.py: Add close() method that breaks cycles.
+ 
+ 	* WidgetRedirector.py: Add unregister() method.
+ 	Unregister everything at closing.
+ 	Don't call close() in __del__, rely on explicit call to close().
+ 
+ 	* IOBinding.py, FormatParagraph.py, CallTips.py:
+ 	Add close() method that breaks a cycle.
+ 
+ Fri Jun 11 15:03:00 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* AutoIndent.py, EditorWindow.py, FormatParagraph.py:
+ 	Tim Peters smart.patch:
+ 
+ 	EditorWindow.py:
+ 
+ 	+ Added get_tabwidth & set_tabwidth "virtual text" methods, that get/set the
+ 	widget's view of what a tab means.
+ 
+ 	+ Moved TK_TABWIDTH_DEFAULT here from AutoIndent.
+ 
+ 	+ Renamed Mark's get_selection_index to get_selection_indices (sorry, Mark,
+ 	but the name was plain wrong <wink>).
+ 
+ 	FormatParagraph.py:  renamed use of get_selection_index.
+ 
+ 	AutoIndent.py:
+ 
+ 	+ Moved TK_TABWIDTH_DEFAULT to EditorWindow.
+ 
+ 	+ Rewrote set_indentation_params to use new VTW get/set_tabwidth methods.
+ 
+ 	+ Changed smart_backspace_event to delete whitespace back to closest
+ 	preceding virtual tab stop or real character (note that this may require
+ 	inserting characters if backspacing over a tab!).
+ 
+ 	+ Nuked almost references to the selection tag, in favor of using
+ 	get_selection_indices.  The sole exception is in set_region, for which no
+ 	"set_selection" abstraction has yet been agreed upon.
+ 
+ 	+ Had too much fun using the spiffy new features of the format-paragraph
+ 	cmd.
+ 
+ Thu Jun 10 17:48:02 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* FormatParagraph.py:
+ 	Code by Mark Hammond to format paragraphs embedded in comments.
+ 	Read the comments (which I reformatted using the new feature :-)
+ 	for some limitations.
+ 
+ 	* EditorWindow.py:
+ 	Added abstraction get_selection_index() (Mark Hammond).  Also
+ 	reformatted some comment blocks to show off a cool feature I'm about
+ 	to check in next.
+ 
+ 	* ClassBrowser.py:
+ 	Adapt to the new pyclbr's support of listing top-level functions.  If
+ 	this functionality is not present (e.g. when used with a vintage
+ 	Python 1.5.2 installation) top-level functions are not listed.
+ 
+ 	(Hmm...  Any distribution of IDLE 0.5 should probably include a copy
+ 	of the new pyclbr.py!)
+ 
+ 	* AutoIndent.py:
+ 	Fix off-by-one error in Tim's recent change to comment_region(): the
+ 	list of lines returned by get_region() contains an empty line at the
+ 	end representing the start of the next line, and this shouldn't be
+ 	commented out!
+ 
+ 	* CallTips.py:
+ 	Mark Hammond writes: Here is another change that allows it to work for
+ 	class creation - tries to locate an __init__ function.  Also updated
+ 	the test code to reflect your new "***" change.
+ 
+ 	* CallTipWindow.py:
+ 	Mark Hammond writes: Tim's suggestion of copying the font for the
+ 	CallTipWindow from the text control makes sense, and actually makes
+ 	the control look better IMO.
+ 
+ Wed Jun  9 20:34:57 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* CallTips.py:
+ 	Append "..." if the appropriate flag (for varargs) in co_flags is set.
+ 	Ditto "***" for kwargs.
+ 
+ Tue Jun  8 13:06:07 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* ReplaceDialog.py:
+ 	Hmm...  Tim didn't turn "replace all" into a single undo block.
+ 	I think I like it better if it os, so here.
+ 
+ 	* ReplaceDialog.py: Tim Peters: made replacement atomic for undo/redo.
+ 
+ 	* AutoIndent.py: Tim Peters:
+ 
+ 	+ Set usetabs=1.  Editing pyclbr.py was driving me nuts <0.6 wink>.
+ 	usetabs=1 is the Emacs pymode default too, and thanks to indentwidth !=
+ 	tabwidth magical usetabs disabling, new files are still created with tabs
+ 	turned off.  The only implication is that if you open a file whose first
+ 	indent is a single tab, IDLE will now magically use tabs for that file (and
+ 	set indentwidth to 8).  Note that the whole scheme doesn't work right for
+ 	PythonWin, though, since Windows users typically set tabwidth to 4; Mark
+ 	probably has to hide the IDLE algorithm from them (which he already knows).
+ 
+ 	+ Changed comment_region_event to stick "##" in front of every line.  The
+ 	"holes" previously left on blank lines were visually confusing (made it
+ 	needlessly hard to figure out what to uncomment later).
+ 
+ Mon Jun  7 15:38:40 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* TreeWidget.py, ObjectBrowser.py:
+ 	Remove unnecessary reference to pyclbr from test() code.
+ 
+ 	* PyParse.py: Tim Peters:
+ 
+ 	Smarter logic for finding a parse synch point.
+ 
+ 	Does a half to a fifth the work in normal cases; don't notice the speedup,
+ 	but makes  more breathing room for other extensions.
+ 
+ 	Speeds terrible cases by at least a factor of 10. "Terrible" == e.g. you put
+ 	""" at the start of Tkinter.py, undo it, zoom to the bottom, and start
+ 	typing in code.  Used to take about 8 seconds for ENTER to respond, now some
+ 	large fraction of a second.  The new code gets indented correctly, despite
+ 	that it all remains "string colored" until the colorizer catches up (after
+ 	which, ENTER appears instantaneous again).
+ 
+ Fri Jun  4 19:21:19 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* extend.py: Might as well enable CallTips by default.
+ 	If there are too many complaints I'll remove it again or fix it.
+ 
+ Thu Jun  3 14:32:16 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* AutoIndent.py, EditorWindow.py, PyParse.py:
+ 	New offerings by Tim Peters; he writes:
+ 
+ 	IDLE is now the first Python editor in the Universe not confused by my
+ 	doctest.py <wink>.
+ 
+ 	As threatened, this defines IDLE's is_char_in_string function as a
+ 	method of EditorWindow.  You just need to define one similarly in
+ 	whatever it is you pass as editwin to AutoIndent; looking at the
+ 	EditorWindow.py part of the patch should make this clear.
+ 
+ 	* GrepDialog.py: Enclose pattern in quotes in status message.
+ 
+ 	* CallTips.py:
+ 	Mark Hammond fixed some comments and improved the way the tip text is
+ 	constructed.
+ 
+ Wed Jun  2 18:18:57 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* CallTips.py:
+ 	My fix to Mark's code: restore the universal check on <KeyRelease>.
+ 	Always cancel on <Key-Escape> or <ButtonPress>.
+ 
+ 	* CallTips.py:
+ 	A version that Mark Hammond posted to the newsgroup.  Has some newer
+ 	stuff for getting the tip.  Had to fix the Key-( and Key-) events
+ 	for Unix.  Will have to re-apply my patch for catching KeyRelease and
+ 	ButtonRelease events.
+ 
+ 	* CallTipWindow.py, CallTips.py:
+ 	Call tips by Mark Hammond (plus tiny fix by me.)
+ 
+ 	* IdleHistory.py:
+ 	Changes by Mark Hammond: (1) support optional output_sep argument to
+ 	the constructor so he can eliminate the sys.ps2 that PythonWin leaves
+ 	in the source; (2) remove duplicate history items.
+ 
+ 	* AutoIndent.py:
+ 	Changes by Mark Hammond to allow using IDLE extensions in PythonWin as
+ 	well: make three dialog routines instance variables.
+ 
+ 	* EditorWindow.py:
+ 	Change by Mark Hammond to allow using IDLE extensions in PythonWin as
+ 	well: make three dialog routines instance variables.
+ 
+ Tue Jun  1 20:06:44 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* AutoIndent.py: Hah!  A fix of my own to Tim's code!
+ 	Unix bindings for <<toggle-tabs>> and <<change-indentwidth>> were
+ 	missing, and somehow that meant the events were never generated,
+ 	even though they were in the menu.  The new Unix bindings are now
+ 	the same as the Windows bindings (M-t and M-u).
+ 
+ 	* AutoIndent.py, PyParse.py, PyShell.py: Tim Peters again:
+ 
+ 	The new version (attached) is fast enough all the time in every real module
+ 	I have <whew!>.  You can make it slow by, e.g., creating an open list with
+ 	5,000 90-character identifiers (+ trailing comma) each on its own line, then
+ 	adding an item to the end -- but that still consumes less than a second on
+ 	my P5-166.  Response time in real code appears instantaneous.
+ 
+ 	Fixed some bugs.
+ 
+ 	New feature:  when hitting ENTER and the cursor is beyond the line's leading
+ 	indentation, whitespace is removed on both sides of the cursor; before
+ 	whitespace was removed only on the left; e.g., assuming the cursor is
+ 	between the comma and the space:
+ 
+ 	def something(arg1, arg2):
+ 	                   ^ cursor to the left of here, and hit ENTER
+ 	               arg2):   # new line used to end up here
+ 	              arg2):    # but now lines up the way you expect
+ 
+ 	New hack:  AutoIndent has grown a context_use_ps1 Boolean config option,
+ 	defaulting to 0 (false) and set to 1 (only) by PyShell.  Reason:  handling
+ 	the fancy stuff requires looking backward for a parsing synch point; ps1
+ 	lines are the only sensible thing to look for in a shell window, but are a
+ 	bad thing to look for in a file window (ps1 lines show up in my module
+ 	docstrings often).  PythonWin's shell should set this true too.
+ 
+ 	Persistent problem:  strings containing def/class can still screw things up
+ 	completely.  No improvement.  Simplest workaround is on the user's head, and
+ 	consists of inserting e.g.
+ 
+ 	def _(): pass
+ 
+ 	(or any other def/class) after the end of the multiline string that's
+ 	screwing them up.  This is especially irksome because IDLE's syntax coloring
+ 	is *not* confused, so when this happens the colors don't match the
+ 	indentation behavior they see.
+ 
+ 	* AutoIndent.py: Tim Peters again:
+ 
+ 	[Tim, after adding some bracket smarts to AutoIndent.py]
+ 	> ...
+ 	> What it can't possibly do without reparsing large gobs of text is
+ 	> suggest a reasonable indent level after you've *closed* a bracket
+ 	> left open on some previous line.
+ 	> ...
+ 
+ 	The attached can, and actually fast enough to use -- most of the time.  The
+ 	code is tricky beyond belief to achieve that, but it works so far; e.g.,
+ 
+ 	        return len(string.expandtabs(str[self.stmt_start :
+ 	                                         ^ indents to caret
+ 	                                         i],
+ 	                                     ^ indents to caret
+ 	                                     self.tabwidth)) + 1
+ 	    ^ indents to caret
+ 
+ 	It's about as smart as pymode now, wrt both bracket and backslash
+ 	continuation rules.  It does require reparsing large gobs of text, and if it
+ 	happens to find something that looks like a "def" or "class" or sys.ps1
+ 	buried in a multiline string, but didn't suck up enough preceding text to
+ 	see the start of the string, it's completely hosed.  I can't repair that --
+ 	it's just too slow to reparse from the start of the file all the time.
+ 
+ 	AutoIndent has grown a new num_context_lines tuple attribute that controls
+ 	how far to look back, and-- like other params --this could/should be made
+ 	user-overridable at startup and per-file on the fly.
+ 
+ 	* PyParse.py: New file by Tim Peters:
+ 
+ 	One new file in the attached, PyParse.py.  The LineStudier (whatever it was
+ 	called <wink>) class was removed from AutoIndent; PyParse subsumes its
+ 	functionality.
+ 
+ 	* AutoIndent.py: Tim Peters keeps revising this module (more to come):
+ 
+ 	Removed "New tabwidth" menu binding.
+ 
+ 	Added "a tab means how many spaces?" dialog to block tabify and untabify.  I
+ 	think prompting for this is good now:  they're usually at-most-once-per-file
+ 	commands, and IDLE can't let them change tabwidth from the Tk default
+ 	anymore, so IDLE can no longer presume to have any idea what a tab means.
+ 
+ 	Irony:  for the purpose of keeping comments aligned via tabs, Tk's
+ 	non-default approach is much nicer than the Emacs/Notepad/Codewright/vi/etc
+ 	approach.
+ 
+ 	* EditorWindow.py:
+ 	1. Catch NameError on import (could be raised by case mismatch on Windows).
+ 	2. No longer need to reset pyclbr cache and show watch cursor when calling
+ 	   ClassBrowser -- the ClassBrowser takes care of pyclbr and the TreeWidget
+ 	   takes care of the watch cursor.
+ 	3. Reset the focus to the current window after error message about class
+ 	   browser on buffer without filename.
+ 
+ 	* Icons/minusnode.gif, Icons/plusnode.gif: Missed a few.
+ 
+ 	* ClassBrowser.py, PathBrowser.py: Rewritten based on TreeWidget.py
+ 
+ 	* ObjectBrowser.py: Object browser, based on TreeWidget.py.
+ 
+ 	* TreeWidget.py: Tree widget done right.
+ 
+ 	* ToolTip.py: As yet unused code for tool tips.
+ 
+ 	* ScriptBinding.py:
+ 	Ensure sys.argv[0] is the script name on Run Script.
+ 
+ 	* ZoomHeight.py: Move zoom height functionality to separate function.
+ 
+ 	* Icons/folder.gif, Icons/openfolder.gif, Icons/python.gif, Icons/tk.gif:
+ 	A few icons used by ../TreeWidget.py and its callers.
+ 
+ 	* AutoIndent.py: New version by Tim Peters improves block opening test.
+ 
+ Fri May 21 04:46:17 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* Attic/History.py, PyShell.py: Rename History to IdleHistory.
+ 	Add isatty() to pseudo files.
+ 
+ 	* StackViewer.py: Make initial stack viewer wider
+ 
+ 	* TODO.txt: New wishes
+ 
+ 	* AutoIndent.py, EditorWindow.py, PyShell.py:
+ 	Much improved autoindent and handling of tabs,
+ 	by Tim Peters.
+ 
+ Mon May  3 15:49:52 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* AutoIndent.py, EditorWindow.py, FormatParagraph.py, UndoDelegator.py:
+ 	Tim Peters writes:
+ 
+ 	I'm still unsure, but couldn't stand the virtual event trickery so tried a
+ 	different sin (adding undo_block_start/stop methods to the Text instance in
+ 	EditorWindow.py).  Like it or not, it's efficient and works <wink>.  Better
+ 	idea?
+ 
+ 	Give the attached a whirl.  Even if you hate the implementation, I think
+ 	you'll like the results.  Think I caught all the "block edit" cmds,
+ 	including Format Paragraph, plus subtler ones involving smart indents and
+ 	backspacing.
+ 
+ 	* WidgetRedirector.py: Tim Peters writes:
+ 
+ 	[W]hile trying to dope out how redirection works, stumbled into two
+ 	possible glitches.  In the first, it doesn't appear to make sense to try to
+ 	rename a command that's already been destroyed; in the second, the name
+ 	"previous" doesn't really bring to mind "ignore the previous value" <wink>.
+ 
+ Fri Apr 30 19:39:25 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* __init__.py: Support for using idle as a package.
+ 
+ 	* PathBrowser.py:
+ 	Avoid listing files more than once (e.g. foomodule.so has two hits:
+ 	once for foo + module.so, once for foomodule + .so).
+ 
+ Mon Apr 26 22:20:38 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* ChangeLog, ColorDelegator.py, PyShell.py: Tim Peters strikes again:
+ 
+ 	Ho ho ho -- that's trickier than it sounded!  The colorizer is working with
+ 	"line.col" strings instead of Text marks, and the absolute coordinates of
+ 	the point of interest can change across the self.update call (voice of
+ 	baffled experience, when two quick backspaces no longer fooled it, but a
+ 	backspace followed by a quick ENTER did <wink>).
+ 
+ 	Anyway, the attached appears to do the trick.  CPU usage goes way up when
+ 	typing quickly into a long triple-quoted string, but the latency is fine for
+ 	me (a relatively fast typist on a relatively slow machine).  Most of the
+ 	changes here are left over from reducing the # of vrbl names to help me
+ 	reason about the logic better; I hope the code is a *little* easier to
+ 
+ Fri Apr 23 14:01:25 1999  Guido van Rossum  <guido@cnri.reston.va.us>
+ 
+ 	* EditorWindow.py:
+ 	Provide full arguments to __import__ so it works in packagized IDLE.
+ 
  Thu Apr 22 23:20:17 1999  Guido van Rossum  <guido@cnri.reston.va.us>
  



From fdrake@acm.org  Tue Feb 15 17:42:21 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 15 Feb 2000 12:42:21 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
In-Reply-To: <Pine.LNX.4.10.10002141714570.7924-100000@nebula.lyra.org>
References: <m12KVzh-000Cw3C@artcom0.artcom-gmbh.de>
 <Pine.LNX.4.10.10002141714570.7924-100000@nebula.lyra.org>
Message-ID: <14505.36861.554432.428111@weyr.cnri.reston.va.us>

Greg Stein writes:
 > Actually, it is arguable which is faster. Using the "in" form means that
 > you construct the tuple at runtime, then perform the "in" check. The
 > version using "or" is simply a couple comparisons.

  Actually, I think the tuple is compiled to an entry in the constants 
table when the contents are also constants (Jeremy, you're playing
with this nowadays; any insight?).

 > In other words, it really comes down to which form is most readable. I
 > think Peter's original form using "or" is more readable. Fredrik's is
 > easier to extend to include more alternatives. Your call :-)

  The two == tests are faster, at least when comparing a local var to
a local var or a constant.


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From guido@cnri.reston.va.us  Tue Feb 15 18:02:14 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:02:14 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle ClassBrowser.py,1.10,1.11
Message-ID: <200002151802.NAA24237@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	ClassBrowser.py 
Log Message:
Add an XXX comment about the ClassBrowser AIP.


Index: ClassBrowser.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/ClassBrowser.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** ClassBrowser.py	1999/06/25 17:08:19	1.10
--- ClassBrowser.py	2000/02/15 18:02:11	1.11
***************
*** 31,34 ****
--- 31,36 ----
  
      def __init__(self, flist, name, path):
+         # XXX This API should change, if the file doesn't end in ".py"
+         # XXX the code here is bogus!
          self.name = name
          self.file = os.path.join(path[0], self.name + ".py")



From guido@cnri.reston.va.us  Tue Feb 15 18:03:04 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:03:04 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle WindowList.py,1.6,1.7
Message-ID: <200002151803.NAA24260@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	WindowList.py 
Log Message:
Correct a typo and remove an unqualified except that was hiding the error.


Index: WindowList.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/WindowList.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** WindowList.py	1999/02/17 17:34:25	1.6
--- WindowList.py	2000/02/15 18:03:01	1.7
***************
*** 40,45 ****
      def unregister_callback(self, callback):
          try:
!             self.callback.remove(callback)
!         except:
              pass
  
--- 40,45 ----
      def unregister_callback(self, callback):
          try:
!            self.callbacks.remove(callback)
!         except ValueError:
              pass
  



From guido@cnri.reston.va.us  Tue Feb 15 18:03:43 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:03:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle StackViewer.py,1.13,1.14
Message-ID: <200002151803.NAA24282@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	StackViewer.py 
Log Message:
New stack viewer, uses a tree widget.
(XXX: the debugger doesn't yet use this.)


Index: StackViewer.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/StackViewer.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** StackViewer.py	1999/05/21 04:45:45	1.13
--- StackViewer.py	2000/02/15 18:03:40	1.14
***************
*** 1,176 ****
  import string
- import sys
- import os
  from Tkinter import *
  import linecache
- from repr import Repr
- from WindowList import ListedToplevel
  
! from ScrolledList import ScrolledList
  
  
! class StackBrowser:
  
!     def __init__(self, root, flist, stack=None):
!         self.top = top = ListedToplevel(root)
!         top.protocol("WM_DELETE_WINDOW", self.close)
!         top.bind("<Key-Escape>", self.close)
!         top.wm_title("Stack viewer")
!         top.wm_iconname("Stack")
!         # Create help label
!         self.helplabel = Label(top,
!             text="Click once to view variables; twice for source",
!             borderwidth=2, relief="groove")
!         self.helplabel.pack(fill="x")
!         #
!         self.sv = StackViewer(top, flist, self)
!         if stack is None:
!             stack = get_stack()
!         self.sv.load_stack(stack)
! 
!     def close(self, event=None):
!         self.top.destroy()
! 
!     localsframe = None
!     localsviewer = None
!     localsdict = None
!     globalsframe = None
!     globalsviewer = None
!     globalsdict = None
!     curframe = None
! 
!     def show_frame(self, (frame, lineno)):
!         if frame is self.curframe:
!             return
!         self.curframe = None
!         if frame.f_globals is not self.globalsdict:
!             self.show_globals(frame)
!         self.show_locals(frame)
!         self.curframe = frame
! 
!     def show_globals(self, frame):
!         title = "Global Variables"
!         if frame.f_globals.has_key("__name__"):
!             try:
!                 name = str(frame.f_globals["__name__"]) + ""
!             except:
!                 name = ""
!             if name:
!                 title = title + " in module " + name
!         self.globalsdict = None
!         if self.globalsviewer:
!             self.globalsviewer.close()
!         self.globalsviewer = None
!         if not self.globalsframe:
!             self.globalsframe = Frame(self.top)
!         self.globalsdict = frame.f_globals
!         self.globalsviewer = NamespaceViewer(
!             self.globalsframe,
!             title,
!             self.globalsdict)
!         self.globalsframe.pack(fill="both", side="bottom")
! 
!     def show_locals(self, frame):
!         self.localsdict = None
!         if self.localsviewer:
!             self.localsviewer.close()
!         self.localsviewer = None
!         if frame.f_locals is not frame.f_globals:
!             title = "Local Variables"
!             code = frame.f_code
!             funcname = code.co_name
!             if funcname not in ("?", "", None):
!                 title = title + " in " + funcname
!             if not self.localsframe:
!                 self.localsframe = Frame(self.top)
!             self.localsdict = frame.f_locals
!             self.localsviewer = NamespaceViewer(
!                 self.localsframe,
!                 title,
!                 self.localsdict)
!             self.localsframe.pack(fill="both", side="top")
!         else:
!             if self.localsframe:
!                 self.localsframe.forget()
  
  
! class StackViewer(ScrolledList):
  
!     def __init__(self, master, flist, browser):
!         ScrolledList.__init__(self, master, width=80)
          self.flist = flist
-         self.browser = browser
-         self.stack = []
  
!     def load_stack(self, stack, index=None):
!         self.stack = stack
!         self.clear()
! ##        if len(stack) > 10:
! ##            l["height"] = 10
! ##            self.topframe.pack(expand=1)
! ##        else:
! ##            l["height"] = len(stack)
! ##            self.topframe.pack(expand=0)
!         for i in range(len(stack)):
!             frame, lineno = stack[i]
!             try:
!                 modname = frame.f_globals["__name__"]
!             except:
!                 modname = "?"
!             code = frame.f_code
!             filename = code.co_filename
!             funcname = code.co_name
!             sourceline = linecache.getline(filename, lineno)
!             sourceline = string.strip(sourceline)
!             if funcname in ("?", "", None):
!                 item = "%s, line %d: %s" % (modname, lineno, sourceline)
!             else:
!                 item = "%s.%s(), line %d: %s" % (modname, funcname,
!                                                  lineno, sourceline)
!             if i == index:
!                 item = "> " + item
!             self.append(item)
!         if index is not None:
!             self.select(index)
! 
!     def popup_event(self, event):
!         if self.stack:
!             return ScrolledList.popup_event(self, event)
! 
!     def fill_menu(self):
!         menu = self.menu
!         menu.add_command(label="Go to source line",
!                          command=self.goto_source_line)
!         menu.add_command(label="Show stack frame",
!                          command=self.show_stack_frame)
! 
!     def on_select(self, index):
!         if 0 <= index < len(self.stack):
!             self.browser.show_frame(self.stack[index])
! 
!     def on_double(self, index):
!         self.show_source(index)
! 
!     def goto_source_line(self):
!         index = self.listbox.index("active")
!         self.show_source(index)
! 
!     def show_stack_frame(self):
!         index = self.listbox.index("active")
!         if 0 <= index < len(self.stack):
!             self.browser.show_frame(self.stack[index])
! 
!     def show_source(self, index):
!         if not (0 <= index < len(self.stack)):
!             return
!         frame, lineno = self.stack[index]
          code = frame.f_code
          filename = code.co_filename
!         if os.path.isfile(filename):
              edit = self.flist.open(filename)
!             if edit:
!                 edit.gotoline(lineno)
  
  
  def get_stack(t=None, f=None):
      if t is None:
--- 1,105 ----
  import string
  from Tkinter import *
  import linecache
  
! from TreeWidget import TreeNode, TreeItem, ScrolledCanvas
! from ObjectBrowser import ObjectTreeItem, make_objecttreeitem
! from OldStackViewer import StackViewer, NamespaceViewer
! 
! def StackBrowser(root, flist=None, stack=None):
!     top = Toplevel(root)
!     sc = ScrolledCanvas(top, bg="white", highlightthickness=0)
!     sc.frame.pack(expand=1, fill="both")
!     item = StackTreeItem(flist)
!     node = TreeNode(sc.canvas, None, item)
!     node.expand()
  
+ class StackTreeItem(TreeItem):
  
!     def __init__(self, flist=None):
!         self.flist = flist
!         self.stack = get_stack()
!         self.text = get_exception()
  
!     def GetText(self):
!         return self.text
  
+     def GetSubList(self):
+         sublist = []
+         for info in self.stack:
+             item = FrameTreeItem(info, self.flist)
+             sublist.append(item)
+         return sublist
  
! class FrameTreeItem(TreeItem):
  
!     def __init__(self, info, flist):
!         self.info = info
          self.flist = flist
  
!     def GetText(self):
!         frame, lineno = self.info
!         try:
!             modname = frame.f_globals["__name__"]
!         except:
!             modname = "?"
          code = frame.f_code
          filename = code.co_filename
!         funcname = code.co_name
!         sourceline = linecache.getline(filename, lineno)
!         sourceline = string.strip(sourceline)
!         if funcname in ("?", "", None):
!             item = "%s, line %d: %s" % (modname, lineno, sourceline)
!         else:
!             item = "%s.%s(...), line %d: %s" % (modname, funcname,
!                                              lineno, sourceline)
! ##        if i == index:
! ##            item = "> " + item
!         return item
! 
!     def GetSubList(self):
!         frame, lineno = self.info
!         sublist = []
!         if frame.f_globals is not frame.f_locals:
!             item = VariablesTreeItem("<locals>", frame.f_locals, self.flist)
!             sublist.append(item)
!         item = VariablesTreeItem("<globals>", frame.f_globals, self.flist)
!         sublist.append(item)
!         return sublist
! 
!     def OnDoubleClick(self):
!         if self.flist:
!             frame, lineno = self.info
!             filename = frame.f_code.co_filename
              edit = self.flist.open(filename)
!             edit.gotoline(lineno)
! 
! class VariablesTreeItem(ObjectTreeItem):
! 
!     def GetText(self):
!         return self.labeltext
! 
!     def GetLabelText(self):
!         return None
  
+     def IsExpandable(self):
+         return len(self.object) > 0
  
+     def keys(self):
+         return self.object.keys()
+ 
+     def GetSubList(self):
+         sublist = []
+         for key in self.keys():
+             try:
+                 value = self.object[key]
+             except KeyError:
+                 continue
+             def setfunction(value, key=key, object=self.object):
+                 object[key] = value
+             item = make_objecttreeitem(key + " =", value, setfunction)
+             sublist.append(item)
+         return sublist
+         
  def get_stack(t=None, f=None):
      if t is None:
***************
*** 190,195 ****
      return stack
  
! 
! def getexception(type=None, value=None):
      if type is None:
          type = sys.last_type
--- 119,123 ----
      return stack
  
! def get_exception(type=None, value=None):
      if type is None:
          type = sys.last_type
***************
*** 201,276 ****
          s = s + ": " + str(value)
      return s
- 
- 
- class NamespaceViewer:
- 
-     def __init__(self, master, title, dict=None):
-         width = 0
-         height = 40
-         if dict:
-             height = 20*len(dict) # XXX 20 == observed height of Entry widget
-         self.master = master
-         self.title = title
-         self.repr = Repr()
-         self.repr.maxstring = 60
-         self.repr.maxother = 60
-         self.frame = frame = Frame(master)
-         self.frame.pack(expand=1, fill="both")
-         self.label = Label(frame, text=title, borderwidth=2, relief="groove")
-         self.label.pack(fill="x")
-         self.vbar = vbar = Scrollbar(frame, name="vbar")
-         vbar.pack(side="right", fill="y")
-         self.canvas = canvas = Canvas(frame,
-                                       height=min(300, max(40, height)),
-                                       scrollregion=(0, 0, width, height))
-         canvas.pack(side="left", fill="both", expand=1)
-         vbar["command"] = canvas.yview
-         canvas["yscrollcommand"] = vbar.set
-         self.subframe = subframe = Frame(canvas)
-         self.sfid = canvas.create_window(0, 0, window=subframe, anchor="nw")
-         self.load_dict(dict)
- 
-     dict = -1
- 
-     def load_dict(self, dict, force=0):
-         if dict is self.dict and not force:
-             return
-         subframe = self.subframe
-         frame = self.frame
-         for c in subframe.children.values():
-             c.destroy()
-         self.dict = None
-         if not dict:
-             l = Label(subframe, text="None")
-             l.grid(row=0, column=0)
-         else:
-             names = dict.keys()
-             names.sort()
-             row = 0
-             for name in names:
-                 value = dict[name]
-                 svalue = self.repr.repr(value) # repr(value)
-                 l = Label(subframe, text=name)
-                 l.grid(row=row, column=0, sticky="nw")
-     ##            l = Label(subframe, text=svalue, justify="l", wraplength=300)
-                 l = Entry(subframe, width=0, borderwidth=0)
-                 l.insert(0, svalue)
-     ##            l["state"] = "disabled"
-                 l.grid(row=row, column=1, sticky="nw")
-                 row = row+1
-         self.dict = dict
-         # XXX Could we use a <Configure> callback for the following?
-         subframe.update_idletasks() # Alas!
-         width = subframe.winfo_reqwidth()
-         height = subframe.winfo_reqheight()
-         canvas = self.canvas
-         self.canvas["scrollregion"] = (0, 0, width, height)
-         if height > 300:
-             canvas["height"] = 300
-             frame.pack(expand=1)
-         else:
-             canvas["height"] = height
-             frame.pack(expand=0)
  
!     def close(self):
!         self.frame.destroy()
--- 129,135 ----
          s = s + ": " + str(value)
      return s
  
! if __name__ == "__main__":
!     root = Tk()
!     root.withdraw()
!     StackBrowser(root)



From guido@cnri.reston.va.us  Tue Feb 15 18:04:11 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:04:11 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle OldStackViewer.py,NONE,1.1
Message-ID: <200002151804.NAA24305@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Added Files:
	OldStackViewer.py 
Log Message:
Adding the old stack viewer implementation back, for the debugger.





From guido@cnri.reston.va.us  Tue Feb 15 18:04:55 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:04:55 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle MultiStatusBar.py,NONE,1.1
Message-ID: <200002151804.NAA24331@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Added Files:
	MultiStatusBar.py 
Log Message:
Status bar code -- by Moshe Zadka.





From guido@cnri.reston.va.us  Tue Feb 15 18:05:18 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:05:18 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle EditorWindow.py,1.28,1.29
Message-ID: <200002151805.NAA24353@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	EditorWindow.py 
Log Message:
Support for Moshe's status bar.


Index: EditorWindow.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/EditorWindow.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** EditorWindow.py	1999/08/26 23:06:05	1.28
--- EditorWindow.py	2000/02/15 18:05:15	1.29
***************
*** 86,89 ****
--- 86,90 ----
      import Bindings
      from Tkinter import Toplevel
+     from MultiStatusBar import MultiStatusBar
  
      about_title = about_title
***************
*** 102,106 ****
          self.top = top = self.Toplevel(root, menu=self.menubar)
          self.vbar = vbar = Scrollbar(top, name='vbar')
!         self.text = text = Text(top, name='text', padx=5,
                                  foreground=cprefs.CNormal[0],
                                  background=cprefs.CNormal[1],
--- 103,108 ----
          self.top = top = self.Toplevel(root, menu=self.menubar)
          self.vbar = vbar = Scrollbar(top, name='vbar')
!         self.text_frame = text_frame = Frame(top)
!         self.text = text = Text(text_frame, name='text', padx=5,
                                  foreground=cprefs.CNormal[0],
                                  background=cprefs.CNormal[1],
***************
*** 140,144 ****
              text['font'] = ("lucida console", 8)
  #            text['font'] = ("courier new", 10)
!         text.pack(side=LEFT, fill=BOTH, expand=1)
          text.focus_set()
  
--- 142,147 ----
              text['font'] = ("lucida console", 8)
  #            text['font'] = ("courier new", 10)
!         text_frame.pack(side=LEFT, fill=BOTH, expand=1)
!         text.pack(side=TOP, fill=BOTH, expand=1)
          text.focus_set()
  
***************
*** 187,190 ****
--- 190,208 ----
              self.extensions['AutoIndent'].set_indentation_params(
                  self.ispythonsource(filename))
+         self.set_status_bar()
+ 
+     def set_status_bar(self):
+         self.status_bar = self.MultiStatusBar(self.text_frame)
+         self.status_bar.set_label('column', 'Col: ?', side=RIGHT)
+         self.status_bar.set_label('line', 'Ln: ?', side=RIGHT)
+         self.status_bar.pack(side=BOTTOM, fill=X)
+         self.text.bind('<KeyRelease>', self.set_line_and_column)
+         self.text.bind('<ButtonRelease>', self.set_line_and_column)
+         self.text.after_idle(self.set_line_and_column)
+ 
+     def set_line_and_column(self, event=None):
+         line, column = string.split(self.text.index(INSERT), '.')
+         self.status_bar.set_label('column', 'Col: %s' % column)
+         self.status_bar.set_label('line', 'Ln: %s' % line)
  
      def wakeup(self):



From guido@cnri.reston.va.us  Tue Feb 15 18:08:22 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:08:22 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle NEWS.txt,1.4,1.5
Message-ID: <200002151808.NAA24430@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	NEWS.txt 
Log Message:
Notice status back and stack viewer.


Index: NEWS.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/NEWS.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** NEWS.txt	2000/02/15 17:17:58	1.4
--- NEWS.txt	2000/02/15 18:08:19	1.5
***************
*** 8,11 ****
--- 8,16 ----
  Tons of stuff, much of it contributed by Tim Peters and Mark Hammond:
  
+ - Status bar, displaying current line/column (Moshe Zadka).
+ 
+ - Better stack viewer, using tree widget.  (XXX Only used by Stack
+ Viewer menu, not by the debugger.)
+ 
  - Format paragraph now recognizes Python block comments and reformats
  them correctly (MH)



From guido@cnri.reston.va.us  Tue Feb 15 18:11:24 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:11:24 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle ChangeLog,1.4,1.5
Message-ID: <200002151811.NAA24541@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	ChangeLog 
Log Message:
More changes.


Index: ChangeLog
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ChangeLog	2000/02/15 17:19:25	1.4
--- ChangeLog	2000/02/15 18:11:21	1.5
***************
*** 1,3 ****
! Tue Feb 15 17:17:58 2000  Guido van Rossum  <guido@cnri.reston.va.us>
  
  	* NEWS.txt: News update.  Probably incomplete; what else is new?
--- 1,22 ----
! Tue Feb 15 18:08:19 2000  Guido van Rossum  <guido@cnri.reston.va.us>
! 
! 	* NEWS.txt: Notice status bar and stack viewer.
! 
! 	* EditorWindow.py: Support for Moshe's status bar.
! 
! 	* MultiStatusBar.py: Status bar code -- by Moshe Zadka.
! 
! 	* OldStackViewer.py:
! 	Adding the old stack viewer implementation back, for the debugger.
! 
! 	* StackViewer.py: New stack viewer, uses a tree widget.
! 	(XXX: the debugger doesn't yet use this.)
! 
! 	* WindowList.py:
! 	Correct a typo and remove an unqualified except that was hiding the error.
! 
! 	* ClassBrowser.py: Add an XXX comment about the ClassBrowser AIP.
! 
! 	* ChangeLog: Updated change log.
  
  	* NEWS.txt: News update.  Probably incomplete; what else is new?



From skip@mojam.com (Skip Montanaro)  Tue Feb 15 18:12:25 2000
From: skip@mojam.com (Skip Montanaro) (Skip Montanaro)
Date: Tue, 15 Feb 2000 12:12:25 -0600 (CST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
In-Reply-To: <14505.36861.554432.428111@weyr.cnri.reston.va.us>
References: <m12KVzh-000Cw3C@artcom0.artcom-gmbh.de>
 <Pine.LNX.4.10.10002141714570.7924-100000@nebula.lyra.org>
 <14505.36861.554432.428111@weyr.cnri.reston.va.us>
Message-ID: <14505.38665.827583.106215@beluga.mojam.com>

    Fred> Greg Stein writes:
    >> Actually, it is arguable which is faster. Using the "in" form means
    >> that you construct the tuple at runtime, then perform the "in"
    >> check. The version using "or" is simply a couple comparisons.

    Fred> Actually, I think the tuple is compiled to an entry in the
    Fred> constants table when the contents are also constants (Jeremy,
    Fred> you're playing with this nowadays; any insight?).

I don't think it does.  This is one of the optimizations I implemented in my 
peephole optimizer though...

Skip Montanaro | http://www.mojam.com/
skip@mojam.com | http://www.musi-cal.com/
"Languages that change by catering to the tastes of non-users tend not to do
so well." - Doug Landauer


From guido@cnri.reston.va.us  Tue Feb 15 18:20:03 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:20:03 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle pyclbr.py,NONE,1.1
Message-ID: <200002151820.NAA24581@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Added Files:
	pyclbr.py 
Log Message:
Temporarily add a copy here for easy distribution.




From guido@cnri.reston.va.us  Tue Feb 15 18:20:31 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:20:31 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle NEWS.txt,1.5,1.6
Message-ID: <200002151820.NAA24603@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	NEWS.txt 
Log Message:
Added some clarifications.


Index: NEWS.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/NEWS.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** NEWS.txt	2000/02/15 18:08:19	1.5
--- NEWS.txt	2000/02/15 18:20:28	1.6
***************
*** 24,28 ****
  
  - Call tip window pops up when you type the name of a known function
! followed by an open parenthesis (MH)
  
  - Comment out region now inserts ## to make it stand out more (TP)
--- 24,29 ----
  
  - Call tip window pops up when you type the name of a known function
! followed by an open parenthesis.  Hit ESC or click elsewhere in the
! window to close the tip window (MH)
  
  - Comment out region now inserts ## to make it stand out more (TP)
***************
*** 31,37 ****
  familiar to Windows users
  
! - Reworked script running commands to be more intuitive
! 
! - XXX much more?!
  
  New in IDLE 0.4 (4/7/99)
--- 32,41 ----
  familiar to Windows users
  
! - Reworked script running commands to be more intuitive: I/O now
! always goes to the *Python Shell* window, and raw_input() works
! correctly.  You use F5 to import/reload a module: this adds the module
! name to the __main__ namespace.  You use Control-F5 to run a script:
! this runs the script *in* the __main__ namespace.  The latter also
! sets sys.argv[] to the script name
  
  New in IDLE 0.4 (4/7/99)



From guido@cnri.reston.va.us  Tue Feb 15 18:31:00 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 13:31:00 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle pyclbr.py,1.1,1.2
Message-ID: <200002151831.NAA24728@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	pyclbr.py 
Log Message:
Oops, somehow the initial checkin was botched. :-(


Index: pyclbr.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/pyclbr.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** pyclbr.py	2000/02/15 18:20:01	1.1
--- pyclbr.py	2000/02/15 18:30:58	1.2
***************
*** 0 ****
--- 1,336 ----
+ """Parse a Python file and retrieve classes and methods.
+ 
+ Parse enough of a Python file to recognize class and method
+ definitions and to find out the superclasses of a class.
+ 
+ The interface consists of a single function:
+ 	readmodule(module, path)
+ module is the name of a Python module, path is an optional list of
+ directories where the module is to be searched.  If present, path is
+ prepended to the system search path sys.path.
+ The return value is a dictionary.  The keys of the dictionary are
+ the names of the classes defined in the module (including classes
+ that are defined via the from XXX import YYY construct).  The values
+ are class instances of the class Class defined here.
+ 
+ A class is described by the class Class in this module.  Instances
+ of this class have the following instance variables:
+ 	name -- the name of the class
+ 	super -- a list of super classes (Class instances)
+ 	methods -- a dictionary of methods
+ 	file -- the file in which the class was defined
+ 	lineno -- the line in the file on which the class statement occurred
+ The dictionary of methods uses the method names as keys and the line
+ numbers on which the method was defined as values.
+ If the name of a super class is not recognized, the corresponding
+ entry in the list of super classes is not a class instance but a
+ string giving the name of the super class.  Since import statements
+ are recognized and imported modules are scanned as well, this
+ shouldn't happen often.
+ 
+ BUGS
+ - Continuation lines are not dealt with at all.
+ - While triple-quoted strings won't confuse it, lines that look like
+   def, class, import or "from ... import" stmts inside backslash-continued
+   single-quoted strings are treated like code.  The expense of stopping
+   that isn't worth it.
+ - Code that doesn't pass tabnanny or python -t will confuse it, unless
+   you set the module TABWIDTH vrbl (default 8) to the correct tab width
+   for the file.
+ 
+ PACKAGE RELATED BUGS
+ - If you have a package and a module inside that or another package
+   with the same name, module caching doesn't work properly since the
+   key is the base name of the module/package.
+ - The only entry that is returned when you readmodule a package is a
+   __path__ whose value is a list which confuses certain class browsers.
+ - When code does:
+   from package import subpackage
+   class MyClass(subpackage.SuperClass):
+     ...
+   It can't locate the parent.  It probably needs to have the same
+   hairy logic that the import locator already does.  (This logic
+   exists coded in Python in the freeze package.)
+ """
+ 
+ import os
+ import sys
+ import imp
+ import re
+ import string
+ 
+ TABWIDTH = 8
+ 
+ _getnext = re.compile(r"""
+     (?P<String>
+        \""" [^"\\]* (?:
+ 			(?: \\. | "(?!"") )
+ 			[^"\\]*
+ 		    )*
+        \"""
+ 
+     |   ''' [^'\\]* (?:
+ 			(?: \\. | '(?!'') )
+ 			[^'\\]*
+ 		    )*
+ 	'''
+     )
+ 
+ |   (?P<Method>
+ 	^
+ 	(?P<MethodIndent> [ \t]* )
+ 	def [ \t]+
+ 	(?P<MethodName> [a-zA-Z_] \w* )
+ 	[ \t]* \(
+     )
+ 
+ |   (?P<Class>
+ 	^
+ 	(?P<ClassIndent> [ \t]* )
+ 	class [ \t]+
+ 	(?P<ClassName> [a-zA-Z_] \w* )
+ 	[ \t]*
+ 	(?P<ClassSupers> \( [^)\n]* \) )?
+ 	[ \t]* :
+     )
+ 
+ |   (?P<Import>
+ 	^ import [ \t]+
+ 	(?P<ImportList> [^#;\n]+ )
+     )
+ 
+ |   (?P<ImportFrom>
+ 	^ from [ \t]+
+ 	(?P<ImportFromPath>
+ 	    [a-zA-Z_] \w*
+ 	    (?:
+ 		[ \t]* \. [ \t]* [a-zA-Z_] \w*
+ 	    )*
+ 	)
+ 	[ \t]+
+ 	import [ \t]+
+ 	(?P<ImportFromList> [^#;\n]+ )
+     )
+ """, re.VERBOSE | re.DOTALL | re.MULTILINE).search
+ 
+ _modules = {}                           # cache of modules we've seen
+ 
+ # each Python class is represented by an instance of this class
+ class Class:
+ 	'''Class to represent a Python class.'''
+ 	def __init__(self, module, name, super, file, lineno):
+ 		self.module = module
+ 		self.name = name
+ 		if super is None:
+ 			super = []
+ 		self.super = super
+ 		self.methods = {}
+ 		self.file = file
+ 		self.lineno = lineno
+ 
+ 	def _addmethod(self, name, lineno):
+ 		self.methods[name] = lineno
+ 
+ class Function(Class):
+ 	'''Class to represent a top-level Python function'''
+ 	def __init__(self, module, name, file, lineno):
+ 		Class.__init__(self, module, name, None, file, lineno)
+ 	def _addmethod(self, name, lineno):
+ 		assert 0, "Function._addmethod() shouldn't be called"
+ 
+ def readmodule(module, path=[], inpackage=0):
+ 	'''Backwards compatible interface.
+ 
+ 	Like readmodule_ex() but strips Function objects from the
+ 	resulting dictionary.'''
+ 
+ 	dict = readmodule_ex(module, path, inpackage)
+ 	res = {}
+ 	for key, value in dict.items():
+ 		if not isinstance(value, Function):
+ 			res[key] = value
+ 	return res
+ 
+ def readmodule_ex(module, path=[], inpackage=0):
+ 	'''Read a module file and return a dictionary of classes.
+ 
+ 	Search for MODULE in PATH and sys.path, read and parse the
+ 	module and return a dictionary with one entry for each class
+ 	found in the module.'''
+ 
+ 	dict = {}
+ 
+ 	i = string.rfind(module, '.')
+ 	if i >= 0:
+ 		# Dotted module name
+ 		package = string.strip(module[:i])
+ 		submodule = string.strip(module[i+1:])
+ 		parent = readmodule(package, path, inpackage)
+ 		child = readmodule(submodule, parent['__path__'], 1)
+ 		return child
+ 
+ 	if _modules.has_key(module):
+ 		# we've seen this module before...
+ 		return _modules[module]
+ 	if module in sys.builtin_module_names:
+ 		# this is a built-in module
+ 		_modules[module] = dict
+ 		return dict
+ 
+ 	# search the path for the module
+ 	f = None
+ 	if inpackage:
+ 		try:
+ 			f, file, (suff, mode, type) = \
+ 				imp.find_module(module, path)
+ 		except ImportError:
+ 			f = None
+ 	if f is None:
+ 		fullpath = list(path) + sys.path
+ 		f, file, (suff, mode, type) = imp.find_module(module, fullpath)
+ 	if type == imp.PKG_DIRECTORY:
+ 		dict['__path__'] = [file]
+ 		_modules[module] = dict
+ 		path = [file] + path
+ 		f, file, (suff, mode, type) = \
+ 				imp.find_module('__init__', [file])
+ 	if type != imp.PY_SOURCE:
+ 		# not Python source, can't do anything with this module
+ 		f.close()
+ 		_modules[module] = dict
+ 		return dict
+ 
+ 	_modules[module] = dict
+ 	imports = []
+ 	classstack = []	# stack of (class, indent) pairs
+ 	src = f.read()
+ 	f.close()
+ 
+ 	# To avoid having to stop the regexp at each newline, instead
+ 	# when we need a line number we simply string.count the number of
+ 	# newlines in the string since the last time we did this; i.e.,
+ 	#    lineno = lineno + \
+ 	#             string.count(src, '\n', last_lineno_pos, here)
+ 	#    last_lineno_pos = here
+ 	countnl = string.count
+ 	lineno, last_lineno_pos = 1, 0
+ 	i = 0
+ 	while 1:
+ 		m = _getnext(src, i)
+ 		if not m:
+ 			break
+ 		start, i = m.span()
+ 
+ 		if m.start("Method") >= 0:
+ 			# found a method definition or function
+ 			thisindent = _indent(m.group("MethodIndent"))
+ 			meth_name = m.group("MethodName")
+ 			lineno = lineno + \
+ 				 countnl(src, '\n',
+ 					 last_lineno_pos, start)
+ 			last_lineno_pos = start
+ 			# close all classes indented at least as much
+ 			while classstack and \
+ 			      classstack[-1][1] >= thisindent:
+ 				del classstack[-1]
+ 			if classstack:
+ 				# it's a class method
+ 				cur_class = classstack[-1][0]
+ 				cur_class._addmethod(meth_name, lineno)
+ 			else:
+ 				# it's a function
+ 				f = Function(module, meth_name,
+ 					     file, lineno)
+ 				dict[meth_name] = f
+ 
+ 		elif m.start("String") >= 0:
+ 			pass
+ 
+ 		elif m.start("Class") >= 0:
+ 			# we found a class definition
+ 			thisindent = _indent(m.group("ClassIndent"))
+ 			# close all classes indented at least as much
+ 			while classstack and \
+ 			      classstack[-1][1] >= thisindent:
+ 				del classstack[-1]
+ 			lineno = lineno + \
+ 				 countnl(src, '\n', last_lineno_pos, start)
+ 			last_lineno_pos = start
+ 			class_name = m.group("ClassName")
+ 			inherit = m.group("ClassSupers")
+ 			if inherit:
+ 				# the class inherits from other classes
+ 				inherit = string.strip(inherit[1:-1])
+ 				names = []
+ 				for n in string.splitfields(inherit, ','):
+ 					n = string.strip(n)
+ 					if dict.has_key(n):
+ 						# we know this super class
+ 						n = dict[n]
+ 					else:
+ 						c = string.splitfields(n, '.')
+ 						if len(c) > 1:
+ 							# super class
+ 							# is of the
+ 							# form module.class:
+ 							# look in
+ 							# module for class
+ 							m = c[-2]
+ 							c = c[-1]
+ 							if _modules.has_key(m):
+ 								d = _modules[m]
+ 								if d.has_key(c):
+ 									n = d[c]
+ 					names.append(n)
+ 				inherit = names
+ 			# remember this class
+ 			cur_class = Class(module, class_name, inherit,
+ 					  file, lineno)
+ 			dict[class_name] = cur_class
+ 			classstack.append((cur_class, thisindent))
+ 
+ 		elif m.start("Import") >= 0:
+ 			# import module
+ 			for n in string.split(m.group("ImportList"), ','):
+ 				n = string.strip(n)
+ 				try:
+ 					# recursively read the imported module
+ 					d = readmodule(n, path, inpackage)
+ 				except:
+ 					##print 'module', n, 'not found'
+ 					pass
+ 
+ 		elif m.start("ImportFrom") >= 0:
+ 			# from module import stuff
+ 			mod = m.group("ImportFromPath")
+ 			names = string.split(m.group("ImportFromList"), ',')
+ 			try:
+ 				# recursively read the imported module
+ 				d = readmodule(mod, path, inpackage)
+ 			except:
+ 				##print 'module', mod, 'not found'
+ 				continue
+ 			# add any classes that were defined in the
+ 			# imported module to our name space if they
+ 			# were mentioned in the list
+ 			for n in names:
+ 				n = string.strip(n)
+ 				if d.has_key(n):
+ 					dict[n] = d[n]
+ 				elif n == '*':
+ 					# only add a name if not
+ 					# already there (to mimic what
+ 					# Python does internally)
+ 					# also don't add names that
+ 					# start with _
+ 					for n in d.keys():
+ 						if n[0] != '_' and \
+ 						   not dict.has_key(n):
+ 							dict[n] = d[n]
+ 		else:
+ 			assert 0, "regexp _getnext found something unexpected"
+ 
+ 	return dict
+ 
+ def _indent(ws, _expandtabs=string.expandtabs):
+ 	return len(_expandtabs(ws, TABWIDTH))



From fdrake@acm.org  Tue Feb 15 18:39:02 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 15 Feb 2000 13:39:02 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14,1.14.4.1
In-Reply-To: <14505.38665.827583.106215@beluga.mojam.com>
References: <m12KVzh-000Cw3C@artcom0.artcom-gmbh.de>
 <Pine.LNX.4.10.10002141714570.7924-100000@nebula.lyra.org>
 <14505.36861.554432.428111@weyr.cnri.reston.va.us>
 <14505.38665.827583.106215@beluga.mojam.com>
Message-ID: <14505.40262.109290.196694@weyr.cnri.reston.va.us>

Skip Montanaro writes:
 > I don't think it does.  This is one of the optimizations I implemented
 > in my peephole optimizer though...

  Yeah, Jeremy just called me on it over the cube wall.  Darn, I wish
we had real walls here!  ;)
  You're right, it *should* be there.  5+.5j should be a constant as
well.


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From gstein@lyra.org  Tue Feb 15 19:00:58 2000
From: gstein@lyra.org (Greg Stein)
Date: Tue, 15 Feb 2000 11:00:58 -0800 (PST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle TODO.txt,1.11,1.12
In-Reply-To: <200002151715.MAA24003@eric.cnri.reston.va.us>
Message-ID: <Pine.LNX.4.10.10002151059010.14242-100000@nebula.lyra.org>

Note that Rational is providing a WebDAV front-end to ClearCase (through
the use of a plug-in back-end to mod_dav). Dunno if Perforce will be, tho.

-g

On Tue, 15 Feb 2000, Guido van Rossum wrote:
> Update of /projects/cvsroot/python/dist/src/Tools/idle
> In directory eric:/projects/python/develop/guido/src/Tools/idle
> 
> Modified Files:
> 	TODO.txt 
> Log Message:
> Tiny addition.
> 
> 
> Index: TODO.txt
> ===================================================================
> RCS file: /projects/cvsroot/python/dist/src/Tools/idle/TODO.txt,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -C2 -r1.11 -r1.12
> *** TODO.txt	1999/09/09 14:16:02	1.11
> --- TODO.txt	2000/02/15 17:15:36	1.12
> ***************
> *** 31,35 ****
>   - make backups when saving
>   - check file mtimes at various points
> ! - interface with RCS/CVS/Perforce ???
>   - status bar???
>   - better help?
> --- 31,35 ----
>   - make backups when saving
>   - check file mtimes at various points
> ! - Pluggable interface with RCS/CVS/Perforce/Clearcase
>   - status bar???
>   - better help?
> 
> 
> _______________________________________________
> Python-checkins mailing list
> Python-checkins@python.org
> http://www.python.org/mailman/listinfo/python-checkins
> 

-- 
Greg Stein, http://www.lyra.org/



From guido@cnri.reston.va.us  Tue Feb 15 19:11:29 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 14:11:29 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle README.txt,1.7,1.8
Message-ID: <200002151911.OAA25067@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	README.txt 
Log Message:
A bit restructured.


Index: README.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/README.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** README.txt	2000/02/15 17:16:40	1.7
--- README.txt	2000/02/15 19:11:26	1.8
***************
*** 2,27 ****
  ------------------------
  
  For news about this release, see the file NEWS.txt.  (For a more
  detailed change log, see the file ChangeLog.)
  
! This is an early release of IDLE, my own attempt at a Tkinter-based
! IDE for Python.  It has the following features:
  
! - 100% pure Python
! - multi-window text editor with multiple undo and Python colorizing
! - Python shell (a.k.a. interactive interpreter) window subclass
! - debugger (not complete, but you can set breakpoints and step)
! - works on Windows and Unix (probably works on Mac too)
! 
! The main program is in the file "idle"; on Windows you can use
! idle.pyw to avoid popping up a DOS console.  Any arguments passed are
! interpreted as files that will be opened for editing.
! 
! IDLE requires Python 1.5.2, so it is currently only usable with the
! Python 1.5.2 distribution (luckily, IDLE is bundled with Python
! 1.5.2).
  
! Please send feedback to the Python newsgroup, comp.lang.python, and cc
! me <guido@python.org>.
  
  --Guido van Rossum (home page: http://www.python.org/~guido/)
--- 2,52 ----
  ------------------------
  
+ This is an early release of IDLE, my own attempt at a Tkinter-based
+ IDE for Python.
+ 
  For news about this release, see the file NEWS.txt.  (For a more
  detailed change log, see the file ChangeLog.)
  
! FEATURES
! 
! IDLE has the following features:
! 
! - coded in 100% pure Python, using the Tkinter GUI toolkit (i.e. Tcl/Tk)
! 
! - cross-platform: works on Windows and Unix (on the Mac, there are
! currently problems with Tcl/Tk)
! 
! - multi-window text editor with multiple undo, Python colorizing
! and many other features, e.g. smart indent and call tips
! 
! - Python shell window (a.k.a. interactive interpreter)
! 
! - debugger (not complete, but you can set breakpoints, view  and step)
! 
! USAGE
! 
! The main program is in the file "idle.py"; on Unix, you should be able
! to run it by typing "./idle.py" to your shell.  On Windows, you can
! run it by double-clicking it; you can use idle.pyw to avoid popping up
! a DOS console.  If you want to pass command line arguments on Windows,
! use the batch file idle.bat.
! 
! Command line arguments: files passed on the command line are executed,
! not opened for editing, unless you give the -e command line option.
! Try "./idle.py -h" to see other command line options.
! 
! IDLE requires Python 1.5.2, so it is currently only usable with a
! Python 1.5.2 distribution.  (An older version of IDLE is distributed
! with Python 1.5.2; you can drop this version on top of it.)
! 
! COPYRIGHT
! 
! IDLE is covered by the standard Python copyright notice
! (http://www.python.org/doc/Copyright.html).
  
! FEEDBACK
  
! For feedback, please use the Python Bugs List
! (http://www.python.org/search/search_bugs.html).
  
  --Guido van Rossum (home page: http://www.python.org/~guido/)



From jhylton@cnri.reston.va.us  Tue Feb 15 21:51:01 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 16:51:01 -0500 (EST)
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_foo.py,NONE,1.1
Message-ID: <200002152151.QAA03437@bitdiddle.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory bitdiddle:/home/jhylton/python/nondist/src/Compiler/tests

Added Files:
	test_foo.py 
Log Message:
silly test case





From jhylton@cnri.reston.va.us  Tue Feb 15 21:57:17 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 16:57:17 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/lib-old Para.py,1.3,1.4
Message-ID: <200002152157.QAA03473@bitdiddle.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/lib-old
In directory bitdiddle:/home/jhylton/python/src/Lib/lib-old

Modified Files:
	Para.py 
Log Message:
no real change -- testing syncmail


Index: Para.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/lib-old/Para.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Para.py	1996/10/08 14:05:32	1.3
--- Para.py	2000/02/15 21:57:14	1.4
***************
*** 1,3 ****
! # Text formatting abstractions
  # Note -- this module is obsolete, it's too slow anyway
  
--- 1,3 ----
! # Text formatting abstractions 
  # Note -- this module is obsolete, it's too slow anyway
  



From jhylton@cnri.reston.va.us  Tue Feb 15 22:09:05 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 17:09:05 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_func.py,1.4,1.5
Message-ID: <200002152209.RAA14400@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_func.py 
Log Message:
no change -- testing syncmail







Index: test_func.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_func.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** test_func.py	2000/02/15 22:08:16	1.4
--- test_func.py	2000/02/15 22:09:02	1.5
***************
*** 15,18 ****
      print test3(None, Ellipsis, "365")
  
- 
  test()
--- 15,17 ----



From jhylton@cnri.reston.va.us  Tue Feb 15 22:10:36 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 17:10:36 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_func.py,1.5,1.6
Message-ID: <200002152210.RAA14429@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_func.py 
Log Message:
no change -- testing syncmail







Index: test_func.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_func.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** test_func.py	2000/02/15 22:09:02	1.5
--- test_func.py	2000/02/15 22:10:33	1.6
***************
*** 15,17 ****
      print test3(None, Ellipsis, "365")
  
! test()
--- 15,18 ----
      print test3(None, Ellipsis, "365")
  
! test();
! 



From jhylton@cnri.reston.va.us  Tue Feb 15 23:43:22 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 18:43:22 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/p2c transformer.py,1.5,1.6
Message-ID: <200002152343.SAA15601@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/p2c
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/p2c

Modified Files:
	transformer.py 
Log Message:
fix creation of Ellipsis node


Index: transformer.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/p2c/transformer.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** transformer.py	2000/02/15 21:30:48	1.5
--- transformer.py	2000/02/15 23:43:19	1.6
***************
*** 1022,1026 ****
      ch = node[1]
      if ch[0] == token.DOT and node[2][0] == token.DOT:
!       return ('ellipsis', None)
      if ch[0] == token.COLON or len(node) > 2:
        return self.com_sliceobj(node)
--- 1022,1026 ----
      ch = node[1]
      if ch[0] == token.DOT and node[2][0] == token.DOT:
!       return Node('ellipsis')
      if ch[0] == token.COLON or len(node) > 2:
        return self.com_sliceobj(node)



From jhylton@cnri.reston.va.us  Tue Feb 15 23:43:37 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 18:43:37 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_except.py,1.2,1.3
Message-ID: <200002152343.SAA15618@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_except.py 
Log Message:
test nested trys



Index: test_except.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_except.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** test_except.py	2000/02/15 21:49:03	1.2
--- test_except.py	2000/02/15 23:43:35	1.3
***************
*** 7,14 ****
  def foo():
      try:
!         1/0
!     except quam():
!         pass
!     raise MyException, "testing"
  
  def bar():
--- 7,22 ----
  def foo():
      try:
!         try:
!             try:
!                 1/0
!             except quam():
!                 print "zero divide"
!             except:
!                 print "uhoh"
!         finally:
!             print "whatever"
!         raise MyException, "testing"
!     finally:
!         print "last word"
  
  def bar():
***************
*** 33,38 ****
      else:
          print "what went wrong?"
  
- baz()
  
  
--- 41,50 ----
      else:
          print "what went wrong?"
+ 
+ try:
+     baz()
+ finally:
+     print "finally"
  
  
  



From jhylton@cnri.reston.va.us  Tue Feb 15 23:43:47 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 18:43:47 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_slice.py,1.1,1.2
Message-ID: <200002152343.SAA15635@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_slice.py 
Log Message:
test sliceobjs




Index: test_slice.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_slice.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** test_slice.py	2000/02/10 00:48:47	1.1
--- test_slice.py	2000/02/15 23:43:44	1.2
***************
*** 1,5 ****
  def test():
      l = range(1, 10)
!     print l[2:3]
      print l[-3:-1]
      print l[:]
--- 1,17 ----
+ class IGottaTestThis:
+     def __getitem__(self, arg):
+         print arg
+         return len(arg)
+     def __setitem__(self, loc, val):
+         print loc
+         print val
+         raise IndexError, "where exactly is that?"
+ 
  def test():
      l = range(1, 10)
!     try:
!         print l[2:3:2]
!     except TypeError:
!         print "this is a little odd"
      print l[-3:-1]
      print l[:]
***************
*** 11,13 ****
--- 23,32 ----
      print l
  
+     obj = IGottaTestThis()
+     print obj[5:10:-5, ..., 1:3:6]
+     try:
+         obj[5:10:-5, ..., 1:3:6] = 4, 5
+     except IndexError:
+         print "didn't think it would work anyway"
+     
  test()



From jhylton@cnri.reston.va.us  Tue Feb 15 23:45:29 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 18:45:29 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler compile.py,1.13,1.14
Message-ID: <200002152345.SAA15655@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	compile.py 
Log Message:
finish first impl of code generator

add support for nodes TryExcept, TryFinally, Sliceobj
fix visitSubscript to properly handle x[a,b,c]





Index: compile.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/compile.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** compile.py	2000/02/14 23:57:56	1.13
--- compile.py	2000/02/15 23:45:26	1.14
***************
*** 156,167 ****
  
  class CodeGenerator:
!     """TODO
  
-     EmptyNode
-     Sliceobj
-     Tryexcept
-     Tryfinally
-     """
- 
      OPTIMIZED = 1
  
--- 156,161 ----
  
  class CodeGenerator:
!     """Generate bytecode for the Python VM"""
  
      OPTIMIZED = 1
  
***************
*** 426,429 ****
--- 420,480 ----
          self.emit('JUMP_ABSOLUTE', l.startAnchor)
  
+     def visitTryExcept(self, node):
+         # XXX need to figure out exactly what is on the stack when an
+         # exception is raised and the first handler is checked
+         handlers = StackRef()
+         end = StackRef()
+         if node.else_:
+             lElse = StackRef()
+         else:
+             lElse = end
+         self.emit('SET_LINENO', node.lineno)
+         self.emit('SETUP_EXCEPT', handlers)
+         self.visit(node.body)
+         self.emit('POP_BLOCK')
+         self.emit('JUMP_FORWARD', lElse)
+         handlers.bind(self.code.getCurInst())
+         
+         last = len(node.handlers) - 1
+         for i in range(len(node.handlers)):
+             expr, target, body = node.handlers[i]
+             if hasattr(expr, 'lineno'):
+                 self.emit('SET_LINENO', expr.lineno)
+             if expr:
+                 self.emit('DUP_TOP')
+                 self.visit(expr)
+                 self.emit('COMPARE_OP', "exception match")
+                 next = StackRef()
+                 self.emit('JUMP_IF_FALSE', next)
+                 self.emit('POP_TOP')
+             self.emit('POP_TOP')
+             if target:
+                 self.visit(target)
+             else:
+                 self.emit('POP_TOP')
+             self.emit('POP_TOP')
+             self.visit(body)
+             self.emit('JUMP_FORWARD', end)
+             next.bind(self.code.getCurInst())
+             self.emit('POP_TOP')
+         self.emit('END_FINALLY')
+         if node.else_:
+             lElse.bind(self.code.getCurInst())
+             self.visit(node.else_)
+         end.bind(self.code.getCurInst())
+         return 1
+     
+     def visitTryFinally(self, node):
+         final = StackRef()
+         self.emit('SET_LINENO', node.lineno)
+         self.emit('SETUP_FINALLY', final)
+         self.visit(node.body)
+         self.emit('POP_BLOCK')
+         self.emit('LOAD_CONST', None)
+         final.bind(self.code.getCurInst())
+         self.visit(node.final)
+         self.emit('END_FINALLY')
+         return 1
+ 
      def visitCompare(self, node):
  	"""Comment from compile.c follows:
***************
*** 493,500 ****
      def visitSubscript(self, node):
          self.visit(node.expr)
!         for sub in node.subs[:-1]:
              self.visit(sub)
!             self.emit('BINARY_SUBSCR')
!         self.visit(node.subs[-1])
          if node.flags == 'OP_APPLY':
              self.emit('BINARY_SUBSCR')
--- 544,551 ----
      def visitSubscript(self, node):
          self.visit(node.expr)
!         for sub in node.subs:
              self.visit(sub)
!         if len(node.subs) > 1:
!             self.emit('BUILD_TUPLE', len(node.subs))
          if node.flags == 'OP_APPLY':
              self.emit('BINARY_SUBSCR')
***************
*** 503,507 ****
  	elif node.flags == 'OP_DELETE':
              self.emit('DELETE_SUBSCR')
!             
          return 1
  
--- 554,558 ----
  	elif node.flags == 'OP_DELETE':
              self.emit('DELETE_SUBSCR')
!         print
          return 1
  
***************
*** 522,527 ****
              self.emit('DELETE_SLICE+%d' % slice)
          else:
!             print node.flags
              raise
          return 1
  
--- 573,585 ----
              self.emit('DELETE_SLICE+%d' % slice)
          else:
!             print "weird slice", node.flags
              raise
+         return 1
+ 
+     def visitSliceobj(self, node):
+         for child in node.nodes:
+             print child
+             self.visit(child)
+         self.emit('BUILD_SLICE', len(node.nodes))
          return 1
  



From jhylton@cnri.reston.va.us  Wed Feb 16 00:49:51 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 19:49:51 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler misc.py,1.3,1.4
Message-ID: <200002160049.TAA16006@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	misc.py 
Log Message:
add flatten helper function


Index: misc.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/misc.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** misc.py	2000/02/10 20:54:27	1.3
--- misc.py	2000/02/16 00:49:47	1.4
***************
*** 1,2 ****
--- 1,13 ----
+ import types
+ 
+ def flatten(tup):
+     elts = []
+     for elt in tup:
+         if type(elt) == types.TupleType:
+             elts = elts + flatten(elt)
+         else:
+             elts.append(elt)
+     return elts
+ 
  class Set:
      def __init__(self):



From jhylton@cnri.reston.va.us  Wed Feb 16 00:50:31 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 19:50:31 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler pyassem.py,1.2,1.3
Message-ID: <200002160050.TAA16027@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	pyassem.py 
Log Message:
fix argcount generation for arg lists containing tuple unpacks
this is sort of a hack



Index: pyassem.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/pyassem.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** pyassem.py	2000/02/15 21:59:50	1.2
--- pyassem.py	2000/02/16 00:50:29	1.3
***************
*** 54,58 ****
  	self.insts = []
          # used by makeCodeObject
!         self.argcount = len(args)
          self.code = ''
          self.consts = [docstring]
--- 54,58 ----
  	self.insts = []
          # used by makeCodeObject
!         self._getArgCount(args)
          self.code = ''
          self.consts = [docstring]
***************
*** 68,71 ****
--- 68,81 ----
          self.lnotab = ''
  
+     def _getArgCount(self, args):
+         if args and args[0][0] == '.':
+             for i in range(len(args)):
+                 if args[i][0] == '.':
+                     num = i
+             self.argcount = num + 1
+         else:
+             self.argcount = len(args)
+                 
+ 
      def __repr__(self):
          return "<bytecode: %d instrs>" % len(self.insts)
***************
*** 232,236 ****
  
      nameOps = ('STORE_NAME', 'IMPORT_NAME', 'IMPORT_FROM',
!                'STORE_ATTR', 'LOAD_ATTR', 'LOAD_NAME', 'DELETE_NAME')
      localOps = ('LOAD_FAST', 'STORE_FAST', 'DELETE_FAST')
      globalOps = ('LOAD_GLOBAL', 'STORE_GLOBAL', 'DELETE_GLOBAL')
--- 242,247 ----
  
      nameOps = ('STORE_NAME', 'IMPORT_NAME', 'IMPORT_FROM',
!                'STORE_ATTR', 'LOAD_ATTR', 'LOAD_NAME', 'DELETE_NAME',
!                'DELETE_ATTR')
      localOps = ('LOAD_FAST', 'STORE_FAST', 'DELETE_FAST')
      globalOps = ('LOAD_GLOBAL', 'STORE_GLOBAL', 'DELETE_GLOBAL')



From jhylton@cnri.reston.va.us  Wed Feb 16 00:51:40 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 19:51:40 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/p2c transformer.py,1.6,1.7
Message-ID: <200002160051.TAA16045@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/p2c
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/p2c

Modified Files:
	transformer.py 
Log Message:
more robust assignment of lineno for keyword args
get the lineno from the name of the keyword arg

example of case that didn't work--
def foo(x, y, a = None,
	b = None):




Index: transformer.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/p2c/transformer.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** transformer.py	2000/02/15 23:43:19	1.6
--- transformer.py	2000/02/16 00:51:37	1.7
***************
*** 994,1000 ****
      if n[0] != token.NAME:
        raise SyntaxError, "keyword can't be an expression (%s)"%n[0]
!     n = Node('keyword', n[1], result)
!     n.lineno = result.lineno
!     return 1, n
  
    def com_subscriptlist(self, primary, nodelist, assigning):
--- 994,1000 ----
      if n[0] != token.NAME:
        raise SyntaxError, "keyword can't be an expression (%s)"%n[0]
!     node = Node('keyword', n[1], result)
!     node.lineno = n[2]
!     return 1, node
  
    def com_subscriptlist(self, primary, nodelist, assigning):



From jhylton@cnri.reston.va.us  Wed Feb 16 00:52:06 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 19:52:06 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_func.py,1.6,1.7
Message-ID: <200002160052.TAA16065@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_func.py 
Log Message:
add example with implicit tuple unpacking for arguments




Index: test_func.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_func.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** test_func.py	2000/02/15 22:10:33	1.6
--- test_func.py	2000/02/16 00:52:04	1.7
***************
*** 10,18 ****
      return zfill(a, 10)
  
  def test():
      print test1(2)
      print test2('a', b='c', c='d', abc='42')
      print test3(None, Ellipsis, "365")
  
! test();
  
--- 10,22 ----
      return zfill(a, 10)
  
+ def test4(((a, b), c), x, (d, (e, f))):
+     return a + b * c - d / e + f
+ 
  def test():
      print test1(2)
      print test2('a', b='c', c='d', abc='42')
      print test3(None, Ellipsis, "365")
+     print test4(((10, 6), 2), 0, (6, (3, 22)))
  
! test()
  



From jhylton@cnri.reston.va.us  Wed Feb 16 00:55:46 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Tue, 15 Feb 2000 19:55:46 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler compile.py,1.14,1.15
Message-ID: <200002160055.TAA16085@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	compile.py 
Log Message:
support for arglists with implicit tuple unpacks
- added a number of support methods to generate code just before the
  body 
- hack protocol for communicating number of args to PyAssembler

fix TryExcept generation for case where exception handler has no body
fix visitAssAttr
add comment about incomplete visitAssName

stop using the ExampleASTVisitor

change script invocation to accept a list of .py files (e.g. Lib/*.py)






Index: compile.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/compile.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** compile.py	2000/02/15 23:45:26	1.14
--- compile.py	2000/02/16 00:55:44	1.15
***************
*** 17,20 ****
--- 17,21 ----
  import stat
  import struct
+ import types
  
  def parse(path):
***************
*** 178,182 ****
          self.name = func.name
          self.filename = filename
!         args = func.argnames
  	self.code = PyAssembler(args=args, name=func.name,
                                   filename=filename)
--- 179,186 ----
          self.name = func.name
          self.filename = filename
! 
!         # keep a lookout for 'def foo((x,y)):'
!         args, hasTupleArg = self.generateArglist(func.argnames)
!         
  	self.code = PyAssembler(args=args, name=func.name,
                                   filename=filename)
***************
*** 189,194 ****
--- 193,231 ----
          self.locals.push(lnf.getLocals())
  	self.emit('SET_LINENO', func.lineno)
+ 	if hasTupleArg:
+             self.generateArgUnpack(func.argnames)
          walk(func.code, self)
  
+     def generateArglist(self, arglist):
+         args = []
+         extra = []
+         count = 0
+         for elt in arglist:
+             if type(elt) == types.StringType:
+                 args.append(elt)
+             elif type(elt) == types.TupleType:
+                 args.append(".nested%d" % count)
+                 count = count + 1
+                 extra.extend(misc.flatten(elt))
+             else:
+                 raise ValueError, "unexpect argument type:", elt
+         return args + extra, count
+ 
+     def generateArgUnpack(self, args):
+         count = 0
+         for arg in args:
+             if type(arg) == types.TupleType:
+                 self.emit('LOAD_FAST', '.nested%d' % count)
+                 count = count + 1
+                 self.unpackTuple(arg)
+                         
+     def unpackTuple(self, tup):
+         self.emit('UNPACK_TUPLE', len(tup))
+         for elt in tup:
+             if type(elt) == types.TupleType:
+                 self.unpackTuple(elt)
+             else:
+                 self.emit('STORE_FAST', elt)
+ 
      def generateFunctionCode(self, func):
          """Generate code for a function body"""
***************
*** 392,396 ****
              lElse = l.breakAnchor
          l.startAnchor.bind(self.code.getCurInst())
!         self.emit('SET_LINENO', node.test.lineno)
          self.visit(node.test)
          self.emit('JUMP_IF_FALSE', lElse)
--- 429,434 ----
              lElse = l.breakAnchor
          l.startAnchor.bind(self.code.getCurInst())
!         if hasattr(node.test, 'lineno'):
!             self.emit('SET_LINENO', node.test.lineno)
          self.visit(node.test)
          self.emit('JUMP_IF_FALSE', lElse)
***************
*** 456,460 ****
              self.visit(body)
              self.emit('JUMP_FORWARD', end)
!             next.bind(self.code.getCurInst())
              self.emit('POP_TOP')
          self.emit('END_FINALLY')
--- 494,499 ----
              self.visit(body)
              self.emit('JUMP_FORWARD', end)
!             if expr:
!                 next.bind(self.code.getCurInst())
              self.emit('POP_TOP')
          self.emit('END_FINALLY')
***************
*** 554,558 ****
  	elif node.flags == 'OP_DELETE':
              self.emit('DELETE_SUBSCR')
-         print
          return 1
  
--- 593,596 ----
***************
*** 597,600 ****
--- 635,639 ----
  
      def visitAssName(self, node):
+         # XXX handle OP_DELETE
          if node.flags != 'OP_ASSIGN':
              print "oops", node.flags
***************
*** 602,610 ****
  
      def visitAssAttr(self, node):
!         if node.flags != 'OP_ASSIGN':
              print "warning: unexpected flags:", node.flags
              print node
-         self.visit(node.expr)
-         self.emit('STORE_ATTR', node.attrname)
          return 1
  
--- 641,652 ----
  
      def visitAssAttr(self, node):
!         self.visit(node.expr)
!         if node.flags == 'OP_ASSIGN':
!             self.emit('STORE_ATTR', node.attrname)
!         elif node.flags == 'OP_DELETE':
!             self.emit('DELETE_ATTR', node.attrname)
!         else:
              print "warning: unexpected flags:", node.flags
              print node
          return 1
  
***************
*** 866,870 ****
          self.ast = t.parsesuite(self.source)
          cg = CodeGenerator(self.filename)
!         walk(self.ast, cg, walker=ExampleASTVisitor)
          self.code = cg.asConst()
  
--- 908,912 ----
          self.ast = t.parsesuite(self.source)
          cg = CodeGenerator(self.filename)
!         walk(self.ast, cg)
          self.code = cg.asConst()
  
***************
*** 889,905 ****
      import getopt
  
      opts, args = getopt.getopt(sys.argv[1:], 'vq')
      for k, v in opts:
          if k == '-v':
              ASTVisitor.VERBOSE = ASTVisitor.VERBOSE + 1
          if k == '-q':
              f = open('/dev/null', 'wb')
              sys.stdout = f
!     if args:
!         filename = args[0]
      else:
!         filename = 'test.py'
!     buf = open(filename).read()
!     mod = CompiledModule(buf, filename)
!     mod.compile()
!     mod.dump(filename + 'c')
--- 931,951 ----
      import getopt
  
+     VERBOSE = 0
      opts, args = getopt.getopt(sys.argv[1:], 'vq')
      for k, v in opts:
          if k == '-v':
+             VERBOSE = 1
              ASTVisitor.VERBOSE = ASTVisitor.VERBOSE + 1
          if k == '-q':
              f = open('/dev/null', 'wb')
              sys.stdout = f
!     if not args:
!         print "no files to compile"
      else:
!         for filename in args:
!             if VERBOSE:
!                 print filename
!             buf = open(filename).read()
!             mod = CompiledModule(buf, filename)
!             mod.compile()
!             mod.dump(filename + 'c')



From guido@cnri.reston.va.us  Wed Feb 16 01:22:38 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 15 Feb 2000 20:22:38 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle NEWS.txt,1.6,1.7
Message-ID: <200002160122.UAA26947@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	NEWS.txt 
Log Message:
The 0.5 release happened on 2/15, not on 2/14. :-)


Index: NEWS.txt
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/NEWS.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** NEWS.txt	2000/02/15 18:20:28	1.6
--- NEWS.txt	2000/02/16 01:22:35	1.7
***************
*** 3,7 ****
  ----------------------------------------------------------------------
  
! New in IDLE 0.5 (2/14/2000)
  -------------------------
  
--- 3,7 ----
  ----------------------------------------------------------------------
  
! New in IDLE 0.5 (2/15/2000)
  -------------------------
  



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 15:15:44 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 10:15:44 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14.4.1,1.14.4.2
Message-ID: <200002161515.KAA24418@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libcrypt.tex 
Log Message:

Latest round of changes from Peter Funk <pf@artcom-gmbh.de>.

Moved all authoring attributions to the markup; none remain in the
text.  Permission received from both authors.


Index: libcrypt.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libcrypt.tex,v
retrieving revision 1.14.4.1
retrieving revision 1.14.4.2
diff -C2 -r1.14.4.1 -r1.14.4.2
*** libcrypt.tex	2000/02/14 22:17:08	1.14.4.1
--- libcrypt.tex	2000/02/16 15:15:41	1.14.4.2
***************
*** 8,11 ****
--- 8,12 ----
  \moduleauthor{Steven D. Majewski}{sdm7g@virginia.edu}
  \sectionauthor{Steven D. Majewski}{sdm7g@virginia.edu}
+ \sectionauthor{Peter Funk}{pf@artcom-gmbh.de}
  
  
***************
*** 18,28 ****
  
  \begin{funcdesc}{crypt}{word, salt} 
! \var{word} will usually be a user's password as typed at a prompt or
! in a graphical interface.  \var{salt} is usually a random
! two-character string which will be used to perturb the DES algorithm
! in one of 4096 ways.  The characters in \var{salt} must be in the set
! \regexp{[./a-zA-Z0-9]}.  Returns the hashed password as a string,
! which will be composed of characters from the same alphabet as the
! salt (the first two characters represent the salt itself).
  \end{funcdesc}
  
--- 19,29 ----
  
  \begin{funcdesc}{crypt}{word, salt} 
!   \var{word} will usually be a user's password as typed at a prompt or 
!   in a graphical interface.  \var{salt} is usually a random
!   two-character string which will be used to perturb the DES algorithm
!   in one of 4096 ways.  The characters in \var{salt} must be in the
!   set \regexp{[./a-zA-Z0-9]}.  Returns the hashed password as a
!   string, which will be composed of characters from the same alphabet
!    as the salt (the first two characters represent the salt itself).
  \end{funcdesc}
  
***************
*** 32,35 ****
--- 33,37 ----
  \begin{verbatim}
  import crypt, getpass, pwd
+ 
  def login():
      username = raw_input('Python login:')
***************
*** 39,45 ****
              raise "Sorry, currently no support for shadow passwords"
          cleartext = getpass.getpass()
!         return crypt(cleartext, cryptedpasswd[0:2]) == cryptedpasswd
  \end{verbatim}
- 
- The module and documentation were written by Steve Majewski.
- \index{Majewski, Steve}
--- 41,46 ----
              raise "Sorry, currently no support for shadow passwords"
          cleartext = getpass.getpass()
!         return crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
!     else:
!         return 1
  \end{verbatim}



From pf@artcom-gmbh.de  Wed Feb 16 15:28:56 2000
From: pf@artcom-gmbh.de (Peter Funk)
Date: Wed, 16 Feb 2000 16:28:56 +0100 (MET)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14.4.1,1.14.4.2
In-Reply-To: <200002161515.KAA24418@weyr.cnri.reston.va.us> from "Fred L. Drake" at "Feb 16, 2000 10:15:44 am"
Message-ID: <m12L6Ns-000Cw4C@artcom0.artcom-gmbh.de>

Hi!

Fred L. Drake:
[...]
> Latest round of changes from Peter Funk <pf@artcom-gmbh.de>.
[...]

You didn't apply the patch using the patch program but edited 
it manually?  Unfortunately you missed a small detail, which Fredrik
pointed out before.  I submitted the following patch (shortened here):

pf> *** ../../../Python-CVS_15_02_00-orig/dist/src/Doc/lib/libcrypt.tex     Tue Feb 
pf> --- Doc/lib/libcrypt.tex        Tue Feb 15 11:59:46 2000
[...]
pf>  import crypt, getpass, pwd
[...]
pf> !         return crypt(cleartext, cryptedpasswd[0:2]) == cryptedpasswd
[...]
pf> !         return crypt.crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
---------------------^^^^^^!

This is why I find unified context diffs far more superior than these old
style context diffs.  In unified context diffs such small changes don't
escape your eyes so easy, since old and new lines come directly after
each other.

[...]
> retrieving revision 1.14.4.2
> diff -C2 -r1.14.4.1 -r1.14.4.2
> *** libcrypt.tex	2000/02/14 22:17:08	1.14.4.1
> --- libcrypt.tex	2000/02/16 15:15:41	1.14.4.2
[...]
> ***************
> *** 39,45 ****
[...]
> !         return crypt(cleartext, cryptedpasswd[0:2]) == cryptedpasswd
>   \end{verbatim}
[...]
> !         return crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
> !     else:
> !         return 1
>   \end{verbatim}
[...]

Sorry for the nitpicking:  But I wanted to keep Fredrik satisfied.

Please let me know, if I can do anything on the content and format
of my patches to simplify the task of automatically applying them
to the CVS.  

For the time being I will try submit patches that fullfill
the following formal conditions:
 1. contain a small argument, why I believe the patch should be applied,
    atmost 3-4 lines of text;  
 2. contain the standard disclaimer;
 3. contain my signature;
 4. and contain finally the patch as an ancient style context diff relative to
    the dist/src subdirectory from a rather recent CVS tarball.

Regards, Peter
-- 
Peter Funk, Oldenburger Str.86, 27777 Ganderkesee, Tel: 04222 9502 70, Fax: -60


From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 16:07:46 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 11:07:46 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.8,1.56.2.9
Message-ID: <200002161607.LAA24839@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p1/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Buffer interface documentation from Greg Stein <gstein@lyra.org>;
thanks!


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.8
retrieving revision 1.56.2.9
diff -C2 -r1.56.2.8 -r1.56.2.9
*** api.tex	2000/02/03 18:23:34	1.56.2.8
--- api.tex	2000/02/16 16:07:43	1.56.2.9
***************
*** 1852,1858 ****
  
  \subsection{Buffer Objects \label{bufferObjects}}
  
! XXX need a real description of buffers and buffer ''segments.``
  
  \begin{cvardesc}{PyTypeObject}{PyBuffer_Type}
  The instance of \ctype{PyTypeObject} which represents the Python
--- 1852,1897 ----
  
  \subsection{Buffer Objects \label{bufferObjects}}
+ \sectionauthor{Greg Stein}{gstein@lyra.org}
  
! Python type objects can export a group of functions called the
! ``buffer interface.'' These functions can be used by an object to
! expose its data in a raw, byte-oriented format. Clients of the object
! can use the buffer interface to access the object data directly,
! without needing to copy it first.
! 
! Two examples of objects that support 
! the buffer interface are strings and arrays. The string object exposes 
! the character contents in the buffer interface's byte-oriented
! form. An array can also expose its contents, but it should be noted
! that array elements may be multi-byte values.
! 
! An example user of the buffer interface is the file object's
! \method{write()} method. Any object that can export a series of bytes
! through the buffer interface can be written to a file. There are a
! number of format codes to \cfunction{PyArgs_ParseTuple()} that operate 
! against an object's buffer interface, returning data from the target
! object.
! 
! More information on the buffer interface is provided in the section
! \ref{newTypes}, under the description for \ctype{PyBufferProcs}.
  
+ A ``buffer object'' is defined in the \file{bufferobject.h} header
+ (included by \file{Python.h}). These objects look very similar to
+ string objects at the Python programming level: they support slicing,
+ indexing, concatenation, and some other standard string
+ operations. However, their data can come from one of two sources: from
+ a block of memory, or from another object which exports the buffer
+ interface.
+ 
+ Buffer objects are useful as a way to expose the data from another
+ object's buffer interface to the Python programmer. They can also be
+ used as a zero-copy slicing mechanism. Using their ability to
+ reference a block of memory, it is possible to expose any data to the
+ Python programmer quite easily. The memory could be a large, constant
+ array in a C extension, it could be a raw block of memory for
+ manipulation before passing to an operating system library, or it
+ could be used to pass around structured data in its native, in-memory
+ format.
+ 
  \begin{cvardesc}{PyTypeObject}{PyBuffer_Type}
  The instance of \ctype{PyTypeObject} which represents the Python
***************
*** 1861,1865 ****
  
  \begin{cvardesc}{int}{Py_END_OF_BUFFER}
! Constant returned by \cfunction{Py}
  \end{cvardesc}
  
--- 1900,1910 ----
  
  \begin{cvardesc}{int}{Py_END_OF_BUFFER}
! This constant may be passed as the \var{size} parameter to
! \cfunction{PyBuffer_FromObject()} or
! \cfunction{PyBuffer_FromReadWriteObject()}. It indicates that the new
! \ctype{PyBufferObject} should refer to \var{base} object from the
! specified \var{offset} to the end of its exported buffer. Using this
! enables the caller to avoid querying the \var{base} object for its
! length.
  \end{cvardesc}
  
***************
*** 1870,1878 ****
  \begin{cfuncdesc}{PyObject*}{PyBuffer_FromObject}{PyObject *base,
                                                    int offset, int size}
! Return a new read-only buffer object.
! Raises \exception{TypeError} if \var{base} doesn't support the
! read-only buffer protocol or doesn't provide exactly one buffer
! segment.  Raises \exception{ValueError} if \var{offset} is less than
! zero.
  \end{cfuncdesc}
  
--- 1915,1928 ----
  \begin{cfuncdesc}{PyObject*}{PyBuffer_FromObject}{PyObject *base,
                                                    int offset, int size}
! Return a new read-only buffer object.  This raises
! \exception{TypeError} if \var{base} doesn't support the read-only
! buffer protocol or doesn't provide exactly one buffer segment, or it
! raises \exception{ValueError} if \var{offset} is less than zero. The
! buffer will hold a reference to the \var{base} object, and the
! buffer's contents will refer to the \var{base} object's buffer
! interface, starting as position \var{offset} and extending for
! \var{size} bytes. If \var{size} is \constant{Py_END_OF_BUFFER}, then
! the new buffer's contents extend to the length of the \var{base}
! object's exported buffer data.
  \end{cfuncdesc}
  
***************
*** 1882,1906 ****
  Return a new writable buffer object.  Parameters and exceptions are
  similar to those for \cfunction{PyBuffer_FromObject()}.
  \end{cfuncdesc}
  
  \begin{cfuncdesc}{PyObject*}{PyBuffer_FromMemory}{void *ptr, int size}
! Return a new read-only buffer object that reads from a memory buffer.
  The caller is responsible for ensuring that the memory buffer, passed
  in as \var{ptr}, is not deallocated while the returned buffer object
  exists.  Raises \exception{ValueError} if \var{size} is less than
  zero.
  \end{cfuncdesc}
  
  \begin{cfuncdesc}{PyObject*}{PyBuffer_FromReadWriteMemory}{void *ptr, int size}
! Return a new writable buffer object that reads from and writes to a
! memory buffer.  The caller is responsible for ensuring that the memory
! buffer, passed in as \var{ptr}, is not deallocated while the returned
! buffer object exists.  Raises \exception{ValueError} if \var{size} is
! less than zero.
  \end{cfuncdesc}
  
  \begin{cfuncdesc}{PyObject*}{PyBuffer_New}{int size}
  Returns a new writable buffer object that maintains its own memory
! buffer of \var{size} bytes.  \var{size} must be zero or positive.
  \end{cfuncdesc}
  
--- 1932,1961 ----
  Return a new writable buffer object.  Parameters and exceptions are
  similar to those for \cfunction{PyBuffer_FromObject()}.
+ 
+ If the \var{base} object does not export the writeable buffer
+ protocol, then \exception{TypeError} is raised.
  \end{cfuncdesc}
  
  \begin{cfuncdesc}{PyObject*}{PyBuffer_FromMemory}{void *ptr, int size}
! Return a new read-only buffer object that reads from a specified
! location in memory, with a specified size.
  The caller is responsible for ensuring that the memory buffer, passed
  in as \var{ptr}, is not deallocated while the returned buffer object
  exists.  Raises \exception{ValueError} if \var{size} is less than
  zero.
+ 
+ Note that \constant{Py_END_OF_BUFFER} may \emph{not} be passed for the
+ \var{size} parameter.
  \end{cfuncdesc}
  
  \begin{cfuncdesc}{PyObject*}{PyBuffer_FromReadWriteMemory}{void *ptr, int size}
! Similar to \cfunction{PyBuffer_FromMemory()}, but the returned buffer
! is writable.
  \end{cfuncdesc}
  
  \begin{cfuncdesc}{PyObject*}{PyBuffer_New}{int size}
  Returns a new writable buffer object that maintains its own memory
! buffer of \var{size} bytes.  \exception{ValueError} is returned if
! \var{size} is not zero or positive.
  \end{cfuncdesc}
  
***************
*** 2572,2577 ****
  extension is imported after the interpreter has been completely
  re-initialized by calling \cfunction{Py_Finalize()} and
! \cfunction{Py_Initialize()}; in that case, the extension's \code{init}
! function \emph{is} called again.
  
  \strong{Bugs and caveats:} Because sub-interpreters (and the main 
--- 2627,2632 ----
  extension is imported after the interpreter has been completely
  re-initialized by calling \cfunction{Py_Finalize()} and
! \cfunction{Py_Initialize()}; in that case, the extension's
! \code{init\var{module}} function \emph{is} called again.
  
  \strong{Bugs and caveats:} Because sub-interpreters (and the main 
***************
*** 3107,3114 ****
  unaryfunc, binaryfunc, ternaryfunc, inquiry, coercion, intargfunc,
  intintargfunc, intobjargproc, intintobjargproc, objobjargproc,
- getreadbufferproc, getsegcountproc, getcharbufferproc,
  destructor, printfunc, getattrfunc, getattrofunc, setattrfunc,
  setattrofunc, cmpfunc, reprfunc, hashfunc
  
  \begin{ctypedesc}{int (*getwritebufferproc) (PyObject *self, int segment,
                                               void **ptrptr)}
--- 3162,3172 ----
  unaryfunc, binaryfunc, ternaryfunc, inquiry, coercion, intargfunc,
  intintargfunc, intobjargproc, intintobjargproc, objobjargproc,
  destructor, printfunc, getattrfunc, getattrofunc, setattrfunc,
  setattrofunc, cmpfunc, reprfunc, hashfunc
  
+ \begin{ctypedesc}{int (*getreadbufferproc) (PyObject *self, int segment,
+                                             void **ptrptr)}
+ \end{ctypedesc}
+ 
  \begin{ctypedesc}{int (*getwritebufferproc) (PyObject *self, int segment,
                                               void **ptrptr)}
***************
*** 3120,3125 ****
--- 3178,3193 ----
  \var{segment} specifies a segment that doesn't exist.
  % Why doesn't it raise ValueError for this one?
+ % GJS: because you shouldn't be calling it with an invalid
+ %      segment. That indicates a blatant programming error in the C
+ %      code.
+ \end{ctypedesc}
+ 
+ \begin{ctypedesc}{int (*getsegcountproc) (PyObject *self, int *lenp)}
  \end{ctypedesc}
  
+ \begin{ctypedesc}{int (*getcharbufferproc) (PyObject *self, int segment,
+                                             const char **ptrptr)}
+ \end{ctypedesc}
+ 
  PyNumberMethods
  
***************
*** 3127,3132 ****
  
  PyMappingMethods
  
! PyBufferProcs
  
  PyTypeObject
--- 3195,3268 ----
  
  PyMappingMethods
+ 
+ \begin{ctypedesc}{PyBufferProcs}
+ \code{PyBufferProcs} defines a set of slots for a Python type
+ object. These slots are used to implement the ``buffer interface.''
+ 
+ The buffer interface exports a model where an object can expose its
+ internal data as a set of chunks of data, each chunk specified as a
+ pointer/length pair. These chunks are called
+ ``segments'' and are presumed to be non-contiguous in memory.
+ 
+ If an object does not export the buffer interface, then its
+ \member{tp_as_buffer} member in the \ctype{PyTypeObject} structure
+ should be \NULL{}. Otherwise, \member{tp_as_buffer} will point to a
+ \ctype{PyBufferProcs} structure.
+ 
+ \emph{Note:} it is very important that your \ctype{PyTypeObject}
+ structure uses \code{Py_TPFLAGS_DEFAULT} for the value of the
+ \member{tp_flags} member. This tells the Python runtime that your
+ \ctype{PyBufferProcs} structure contains the \member{bf_getcharbuffer} 
+ slot. Older versions of Python did not have this member, so a new
+ Python interpreter using an old extension needs to be able to test for 
+ its presence before using it.
+ 
+ The first slot in the \ctype{PyBufferProcs} structure is
+ \member{bf_getreadbuffer}, which has type
+ \ctype{getreadbufferproc}. If this slot is \NULL{}, then the object does
+ not support reading from the internal data. This is non-sensical, so
+ implementors should fill this in. The read-buffer function is allowed
+ to raise an exception and return \code{-1}. Callers should test for
+ \NULL{} before using the slot and should check for an exception. The
+ \var{segment} which is passed must be zero or positive, and strictly less
+ than the number of segments returned by the \member{bf_getsegcount}
+ slot function.
+ 
+ The next slot is \member{bf_getwritebuffer} having type
+ \ctype{getwritebufferproc}. This slot may be \NULL{} if the object
+ does not allow writing into its returned buffers. If the slot function 
+ is present, it is allowed to raise an exception and return \code{-1}.
+ The \var{segment} follows the same restrictions as for
+ \member{bf_getreadbuffer}.
+ 
+ The third slot is \member{bf_getsegcount}, with type
+ \ctype{getsegcountproc}. This slot must not be \NULL{} and is used to
+ inform the caller how many segments the object contains. Simple
+ objects such as \ctype{PyString_Type} and \ctype{PyBuffer_Type}
+ objects contain a single segment. The \var{lenp} parameter may be
+ \NULL{}. If not, then the implementation should store the total size of all 
+ buffer segments into \code{*lenp}.
+ 
+ The last slot is \member{bf_getcharbuffer}, which has type
+ \ctype{getcharbufferproc}. This slot will only be present if the
+ \code{Py_TPFLAGS_HAVE_GETCHARBUFFER} flag is present in
+ \member{tp_flags} of the object's \ctype{PyTypeObject}. Before using
+ this slot, the caller should test whether it is present by using the
+ \cfunction{PyType_HasFeature()} macro. Assuming the slot is present,
+ then it may be \NULL{} indicating that the object's contents cannot be 
+ used a \emph{8-bit characters}. The slot function may also raise an
+ error if the object's contents cannot be interpreted as 8-bit
+ characters. For example, if the object is an array 
+ which is configured to hold floating point values, an exception may be 
+ raised if a caller attempts to use \member{bf_getcharbuffer} to fetch
+ a sequence of 8-bit characters. This notion of exporting the internal
+ buffers as ``text'' is used to distinguish between objects that are
+ binary in nature, and those which have character-based content.
+ 
+ \emph{Note:} the current policy seems to state that these
+ characters may be multi-byte characters. This implies that a buffer
+ size of \var{N} does not mean there are \var{N} characters present.
  
! \end{ctypedesc}
  
  PyTypeObject



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 16:21:29 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 11:21:29 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14.4.2,1.14.4.3
Message-ID: <200002161621.LAA24991@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libcrypt.tex 
Log Message:

Oops, I mis-applied the patch from Peter with my visual application
technique!  ;)  This gets the last bit in.


Index: libcrypt.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libcrypt.tex,v
retrieving revision 1.14.4.2
retrieving revision 1.14.4.3
diff -C2 -r1.14.4.2 -r1.14.4.3
*** libcrypt.tex	2000/02/16 15:15:41	1.14.4.2
--- libcrypt.tex	2000/02/16 16:21:27	1.14.4.3
***************
*** 41,45 ****
              raise "Sorry, currently no support for shadow passwords"
          cleartext = getpass.getpass()
!         return crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
      else:
          return 1
--- 41,45 ----
              raise "Sorry, currently no support for shadow passwords"
          cleartext = getpass.getpass()
!         return crypt.crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
      else:
          return 1



From fdrake@acm.org  Wed Feb 16 16:24:52 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Wed, 16 Feb 2000 11:24:52 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libcrypt.tex,1.14.4.1,1.14.4.2
In-Reply-To: <m12L6Ns-000Cw4C@artcom0.artcom-gmbh.de>
References: <200002161515.KAA24418@weyr.cnri.reston.va.us>
 <m12L6Ns-000Cw4C@artcom0.artcom-gmbh.de>
Message-ID: <14506.53076.191605.445978@weyr.cnri.reston.va.us>

Peter Funk writes:
 > You didn't apply the patch using the patch program but edited 
 > it manually?  Unfortunately you missed a small detail, which Fredrik
 > pointed out before.  I submitted the following patch (shortened here):

  Actually, I usually apply small patches manually, mostly because
it's easier than saving to a file and applying it.  I'm sure I could
come up with an XEmacs shortcut, but that requires digging even
further into elisp.  ;(

 > pf> !         return crypt.crypt(cleartext, cryptedpasswd[:2]) == cryptedpasswd
 > ---------------------^^^^^^!

  Ok, ok.... fixed in CVS now.

 > Sorry for the nitpicking:  But I wanted to keep Fredrik satisfied.

  Please don't be!  This is what makes Python's docs good.

 > Please let me know, if I can do anything on the content and format
 > of my patches to simplify the task of automatically applying them
 > to the CVS.  

  No need to change, and the unidiffs are fine.  The problem here was
wetware, not software.  ;)


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 17:14:01 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 12:14:01 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/perl python.perl,1.65.2.3,1.65.2.4
Message-ID: <200002161714.MAA25735@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/perl
In directory weyr:/home/fdrake/projects/python/Doc-152p1/perl

Modified Files:
      Tag: release152p1-patches
	python.perl 
Log Message:

Work over the table support a little; this gets the 'r' column
specifier right (previously not properly handled for data cells in
tables, header cells were fine).

get_th():  Removed.

figure_column_alignment():  New function; converts a latex table
        column specifier to the appropriate 'align="foo"' value
        suitable for use in <th> and <td> start tags.  (get_th() was
        specific to <th>.)

setup_column_alignments():  Adjusted to use figure_column_alignment()
        instead of get_th().

do_cmd_lineii(),
do_cmd_lineiii(),
do_cmd_lineiv():  If the first cell is right-aligned, add a trailing
        non-breaking space for padding.  This improves readability
        when the first column is right-aligned and the second column
        is left-aligned.

do_env_tableii(),
do_env_tableiii(),
do_env_tableiv():  But don't overdo the first-column padding in the
        header cells.


Index: python.perl
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.65.2.3
retrieving revision 1.65.2.4
diff -C2 -r1.65.2.3 -r1.65.2.4
*** python.perl	2000/02/01 19:06:40	1.65.2.3
--- python.perl	2000/02/16 17:13:58	1.65.2.4
***************
*** 869,886 ****
  $TABLE_HEADER_BGCOLOR = $NAV_BGCOLOR;
  
- sub get_th{
-     my $a = @_[0];
-     my $r = '<th>';
-     if ($a eq 'l')
-       { $r = '<th align="left">'; }
-     elsif (substr($a, 0, 1) eq 'p')
-       { $r = '<th align="left">'; }
-     elsif ($a eq 'r')
-       { $r = '<th align="right">'; }
-     elsif ($a eq 'c')
-       { $r = '<th align="center">'; }
-     return $r;
- }
- 
  sub fix_font{
      # do a little magic on a font name to get the right behavior in the first
--- 869,872 ----
***************
*** 899,913 ****
  }
  
  sub setup_column_alignments{
      local($_) = @_;
!     my($a1,$a2,$a3,$a4) = split(/[|]/,$_);
!     my($th1,$th2,$th3,$th4) = ('<th>', '<th>', '<th>', '<th>');
!     $col_aligns[0] = (($a1 eq 'c') ? '<td align="center" valign="baseline">'
! 		                   : '<td valign="baseline">');
!     $col_aligns[1] = (($a2 eq 'c') ? '<td align="center">' : '<td>');
!     $col_aligns[2] = (($a3 eq 'c') ? '<td align="center">' : '<td>');
!     $col_aligns[3] = (($a4 eq 'c') ? '<td align="center">' : '<td>');
      # return the aligned header start tags
!     return (get_th($a1), get_th($a2), get_th($a3), get_th($a4));
  }
  
--- 885,916 ----
  }
  
+ sub figure_column_alignment{
+     my $a = @_[0];
+     my $mark = substr($a, 0, 1);
+     my $r = '';
+     if ($mark eq 'c')
+       { $r = ' align="center"'; }
+     elsif ($mark eq 'r')
+       { $r = ' align="right" '; }
+     elsif ($mark eq 'l')
+       { $r = ' align="left"  '; }
+     elsif ($mark eq 'p')
+       { $r = ' align="left"  '; }
+     return $r;
+ }
+ 
  sub setup_column_alignments{
      local($_) = @_;
!     my($s1,$s2,$s3,$s4) = split(/[|]/,$_);
!     my $a1 = figure_column_alignment($s1);
!     my $a2 = figure_column_alignment($s2);
!     my $a3 = figure_column_alignment($s3);
!     my $a4 = figure_column_alignment($s4);
!     $col_aligns[0] = "<td$a1 valign=\"baseline\">";
!     $col_aligns[1] = "<td$a2>";
!     $col_aligns[2] = "<td$a3>";
!     $col_aligns[3] = "<td$a4>";
      # return the aligned header start tags
!     return ("<th$a1>", "<th$a2>", "<th$a3>", "<th$a4>");
  }
  
***************
*** 934,939 ****
             . "\n  <thead>"
             . "\n    <tr$TABLE_HEADER_BGCOLOR>"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;\&nbsp;</th>"
  	   . "\n    </thead>"
  	   . "\n  <tbody valign='baseline'>"
--- 937,942 ----
             . "\n  <thead>"
             . "\n    <tr$TABLE_HEADER_BGCOLOR>"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;</th>"
  	   . "\n    </thead>"
  	   . "\n  <tbody valign='baseline'>"
***************
*** 951,955 ****
      $c2 = '&nbsp;' if ($c2 eq '');
      my($c1align,$c2align) = @col_aligns[0,1];
!     return "\n    <tr>$c1align$sfont$c1$efont</td>\n"
             . "        $c2align$c2</td>"
  	   . $_;
--- 954,962 ----
      $c2 = '&nbsp;' if ($c2 eq '');
      my($c1align,$c2align) = @col_aligns[0,1];
!     my $padding = '';
!     if ($c1align =~ /align="right"/) {
!         $padding = '&nbsp;';
!     }
!     return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>"
  	   . $_;
***************
*** 968,974 ****
             . "\n  <thead>"
             . "\n    <tr$TABLE_HEADER_BGCOLOR>"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;\&nbsp;</th>"
! 	   . "\n      $th3<b>$h3</b>\&nbsp;\&nbsp;</th>"
  	   . "\n    </thead>"
  	   . "\n  <tbody valign='baseline'>"
--- 975,981 ----
             . "\n  <thead>"
             . "\n    <tr$TABLE_HEADER_BGCOLOR>"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;</th>"
! 	   . "\n      $th3<b>$h3</b>\&nbsp;</th>"
  	   . "\n    </thead>"
  	   . "\n  <tbody valign='baseline'>"
***************
*** 987,991 ****
      $c3 = '&nbsp;' if ($c3 eq '');
      my($c1align,$c2align,$c3align) = @col_aligns[0,1,2];
!     return "\n    <tr>$c1align$sfont$c1$efont</td>\n"
             . "        $c2align$c2</td>\n"
  	   . "        $c3align$c3</td>"
--- 994,1002 ----
      $c3 = '&nbsp;' if ($c3 eq '');
      my($c1align,$c2align,$c3align) = @col_aligns[0,1,2];
!     my $padding = '';
!     if ($c1align =~ /align="right"/) {
!         $padding = '&nbsp;';
!     }
!     return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>\n"
  	   . "        $c3align$c3</td>"
***************
*** 1006,1013 ****
             . "\n  <thead>"
             . "\n    <tr$TABLE_HEADER_BGCOLOR>"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;\&nbsp;</th>"
! 	   . "\n      $th3<b>$h3</b>\&nbsp;\&nbsp;</th>"
! 	   . "\n      $th4<b>$h4</b>\&nbsp;\&nbsp;</th>"
  	   . "\n    </thead>"
  	   . "\n  <tbody valign='baseline'>"
--- 1017,1024 ----
             . "\n  <thead>"
             . "\n    <tr$TABLE_HEADER_BGCOLOR>"
! 	   . "\n      $th1<b>$h1</b>\&nbsp;</th>"
! 	   . "\n      $th2<b>$h2</b>\&nbsp;</th>"
! 	   . "\n      $th3<b>$h3</b>\&nbsp;</th>"
! 	   . "\n      $th4<b>$h4</b>\&nbsp;</th>"
  	   . "\n    </thead>"
  	   . "\n  <tbody valign='baseline'>"
***************
*** 1027,1031 ****
      $c4 = '&nbsp;' if ($c4 eq '');
      my($c1align,$c2align,$c3align,$c4align) = @col_aligns;
!     return "\n    <tr>$c1align$sfont$c1$efont</td>\n"
             . "        $c2align$c2</td>\n"
  	   . "        $c3align$c3</td>\n"
--- 1038,1046 ----
      $c4 = '&nbsp;' if ($c4 eq '');
      my($c1align,$c2align,$c3align,$c4align) = @col_aligns;
!     my $padding = '';
!     if ($c1align =~ /align="right"/) {
!         $padding = '&nbsp;';
!     }
!     return "\n    <tr>$c1align$sfont$c1$efont$padding</td>\n"
             . "        $c2align$c2</td>\n"
  	   . "        $c3align$c3</td>\n"



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 17:17:03 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 12:17:03 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libgrp.tex,1.13,1.13.4.1 libpwd.tex,1.11,1.11.4.1
Message-ID: <200002161717.MAA25774@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libgrp.tex libpwd.tex 
Log Message:

Improved descriptions and added cross-references from Peter Funk
<pf@artcom-gmbh.de>.  Includes limited markup changes by FLD.


Index: libgrp.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libgrp.tex,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -C2 -r1.13 -r1.13.4.1
*** libgrp.tex	1999/03/02 17:03:37	1.13
--- libgrp.tex	2000/02/16 17:16:59	1.13.4.1
***************
*** 12,19 ****
  Group database entries are reported as 4-tuples containing the
  following items from the group database (see \code{<grp.h>}), in order:
! \code{gr_name},
! \code{gr_passwd},
! \code{gr_gid},
! \code{gr_mem}.
  The gid is an integer, name and password are strings, and the member
  list is a list of strings.
--- 12,23 ----
  Group database entries are reported as 4-tuples containing the
  following items from the group database (see \code{<grp.h>}), in order:
! 
! \begin{tableiii}{r|l|l}{textrm}{Index}{Field}{Meaning}
!   \lineiii{0}{gr_name}{the name of the group}
!   \lineiii{1}{gr_passwd}{the (encrypted) group password; often empty}
!   \lineiii{2}{gr_gid}{the numerical group ID}
!   \lineiii{3}{gr_mem}{all the group member's  user  names}
! \end{tableiii}
! 
  The gid is an integer, name and password are strings, and the member
  list is a list of strings.
***************
*** 35,36 ****
--- 39,45 ----
  Return a list of all available group entries, in arbitrary order.
  \end{funcdesc}
+ 
+ 
+ \begin{seealso}
+   \seemodule{pwd}{An interface to the user database, similar to this.}
+ \end{seealso}

Index: libpwd.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libpwd.tex,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -C2 -r1.11 -r1.11.4.1
*** libpwd.tex	1999/03/02 17:03:39	1.11
--- libpwd.tex	2000/02/16 17:17:00	1.11.4.1
***************
*** 6,24 ****
  \modulesynopsis{The password database (\function{getpwnam()} and friends).}
  
! This module provides access to the \UNIX{} password database.
! It is available on all \UNIX{} versions.
  
  Password database entries are reported as 7-tuples containing the
  following items from the password database (see \code{<pwd.h>}), in order:
! \code{pw_name},
! \code{pw_passwd},
! \code{pw_uid},
! \code{pw_gid},
! \code{pw_gecos},
! \code{pw_dir},
! \code{pw_shell}.
  The uid and gid items are integers, all others are strings.
  \exception{KeyError} is raised if the entry asked for cannot be found.
  
  It defines the following items:
  
--- 6,36 ----
  \modulesynopsis{The password database (\function{getpwnam()} and friends).}
  
! This module provides access to the \UNIX{} user account and password
! database.  It is available on all \UNIX{} versions.
  
  Password database entries are reported as 7-tuples containing the
  following items from the password database (see \code{<pwd.h>}), in order:
! 
! \begin{tableiii}{r|l|l}{textrm}{Index}{Field}{Meaning}
!   \lineiii{0}{\code{pw_name}}{Login name}
!   \lineiii{1}{\code{pw_passwd}}{Optional encrypted password}
!   \lineiii{2}{\code{pw_uid}}{Numerical user ID}
!   \lineiii{3}{\code{pw_gid}}{Numerical group ID}
!   \lineiii{4}{\code{pw_gecos}}{User name or comment field}
!   \lineiii{5}{\code{pw_dir}}{User home directory}
!   \lineiii{6}{\code{pw_shell}}{User command interpreter}
! \end{tableiii}
! 
  The uid and gid items are integers, all others are strings.
  \exception{KeyError} is raised if the entry asked for cannot be found.
  
+ \strong{Note:} In traditional \UNIX{} the field \code{pw_passwd} usually
+ contains a password encrypted with a DES derived algorithm (see module
+ \refmodule{crypt}\refbimodindex{crypt}).  However most modern unices 
+ use a so-called \emph{shadow password} system.  On those unices the
+ field \code{pw_passwd} only contains a asterisk (\code{'*'}) or the 
+ letter \character{x} where the encrypted password is stored in a file
+ \file{/etc/shadow} which is not world readable.
+ 
  It defines the following items:
  
***************
*** 34,35 ****
--- 46,52 ----
  Return a list of all available password database entries, in arbitrary order.
  \end{funcdesc}
+ 
+ 
+ \begin{seealso}
+   \seemodule{grp}{An interface to the group database, similar to this.}
+ \end{seealso}



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 17:25:43 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 12:25:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/ext ext.tex,1.68.2.5,1.68.2.6
Message-ID: <200002161725.MAA25883@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/ext
In directory weyr:/home/fdrake/projects/python/Doc-152p1/ext

Modified Files:
      Tag: release152p1-patches
	ext.tex 
Log Message:

Revised link to old "dynamic linking" chapter to the much-changed
document structure.  Thanks to Peter Funk <pf@artcom-gmbh.de>.

Slight changes to markup.


Index: ext.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/ext/ext.tex,v
retrieving revision 1.68.2.5
retrieving revision 1.68.2.6
diff -C2 -r1.68.2.5 -r1.68.2.6
*** ext.tex	2000/01/18 22:36:19	1.68.2.5
--- ext.tex	2000/02/16 17:25:40	1.68.2.6
***************
*** 455,460 ****
  compiling and linking it with the Python system.  If you use dynamic
  loading, the details depend on the style of dynamic loading your
! system uses; see the chapter ``Dynamic Loading'' for more information
! about this.
  
  If you can't use dynamic loading, or if you want to make your module a
--- 455,462 ----
  compiling and linking it with the Python system.  If you use dynamic
  loading, the details depend on the style of dynamic loading your
! system uses; see the chapters about building extension modules on
! \UNIX{} (chapter \ref{building-on-unix}) and Windows (chapter
! \ref{building-on-windows}) for more information about this.
! % XXX Add information about MacOS  
  
  If you can't use dynamic loading, or if you want to make your module a



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 18:47:00 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 13:47:00 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/paper-letter Makefile,1.12,1.12.4.1
Message-ID: <200002161847.NAA26145@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/paper-letter
In directory weyr:/home/fdrake/projects/python/Doc-152p1/paper-letter

Modified Files:
      Tag: release152p1-patches
	Makefile 
Log Message:

The README file depends on the ../tools/getpagecounts script.


Index: Makefile
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/paper-letter/Makefile,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -C2 -r1.12 -r1.12.4.1
*** Makefile	1999/04/14 14:04:39	1.12
--- Makefile	2000/02/16 18:46:57	1.12.4.1
***************
*** 76,80 ****
  
  
! README:	$(PSFILES)
  	$(TOOLSDIR)/getpagecounts >$@
  
--- 76,80 ----
  
  
! README:	$(PSFILES) $(TOOLSDIR)/getpagecounts
  	$(TOOLSDIR)/getpagecounts >$@
  



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 18:49:47 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 13:49:47 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools mkhowto,1.4,1.4.4.1
Message-ID: <200002161849.NAA26198@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tools
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tools

Modified Files:
      Tag: release152p1-patches
	mkhowto 
Log Message:

Be a little more helpful in case LaTeX2HTML ever gets updated (at
least one user tried a newer version).


Index: mkhowto
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tools/mkhowto,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** mkhowto	1999/05/06 19:37:38	1.4
--- mkhowto	2000/02/16 18:49:45	1.4.4.1
***************
*** 304,307 ****
--- 304,309 ----
              texfile = texfile[2:]
          # build the command line and run LaTeX2HTML:
+         if not os.path.isdir(builddir):
+             os.mkdir(builddir)
          args = [LATEX2HTML_BINARY,
                  "-init_file", L2H_INIT_FILE,



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 18:48:18 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 13:48:18 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools getpagecounts,1.5,1.5.2.1
Message-ID: <200002161848.NAA26175@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tools
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tools

Modified Files:
      Tag: release152p1-patches
	getpagecounts 
Log Message:

Point to the PSA Bookstore and suggest support for the PSA &
Consortium.


Index: getpagecounts
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tools/getpagecounts,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** getpagecounts	1999/08/03 17:54:39	1.5
--- getpagecounts	2000/02/16 18:48:15	1.5.2.1
***************
*** 4,8 ****
  """Generate a page count report of the PostScript version of the manuals."""
  
! __version__ = '$Revision: 1.5 $'
  
  
--- 4,8 ----
  """Generate a page count report of the PostScript version of the manuals."""
  
! __version__ = '$Revision: 1.5.2.1 $'
  
  
***************
*** 44,48 ****
  This is the PostScript version of the standard Python documentation.
  If you plan to print this, be aware that some of the documents are
! long.  The following manuals are included:
  """
      SUFFIX = """\
--- 44,55 ----
  This is the PostScript version of the standard Python documentation.
  If you plan to print this, be aware that some of the documents are
! long.  It is formatted for printing on two-sided paper; if you do plan
! to print this, *please* print two-sided if you have a printer capable
! of it!  To locate published copies of the larger manuals, or other
! Python reference material, consult the PSA Online Bookstore at:
! 
!              http://www.python.org/psa/bookstore/
! 
! The following manuals are included:
  """
      SUFFIX = """\
***************
*** 51,54 ****
--- 58,67 ----
  If you have any questions, comments, or suggestions regarding these
  documents, please send them via email to python-docs@python.org.
+ 
+ If you would like to support the development and maintenance of
+ documentation for Python, please consider joining the Python Software
+ Activity (PSA; see http://www.python.org/psa/), or urging your
+ organization to join the PSA or the Python Consortium (see
+ http://www.python.org/consortium/).
  """
  



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 18:50:12 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 13:50:12 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools mkhtml.sh,1.10,1.10.4.1
Message-ID: <200002161850.NAA26221@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tools
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tools

Modified Files:
      Tag: release152p1-patches
	mkhtml.sh 
Log Message:

Be a little more helpful in case LaTeX2HTML ever gets updated (at
least one user tried a newer version).


Index: mkhtml.sh
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tools/mkhtml.sh,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -C2 -r1.10 -r1.10.4.1
*** mkhtml.sh	1999/05/03 14:27:45	1.10
--- mkhtml.sh	2000/02/16 18:50:09	1.10.4.1
***************
*** 28,31 ****
--- 28,33 ----
  if [ -d $part ] ; then
      rm -f $part/*.html
+ else
+     mkdir $part
  fi
  



From fdrake@weyr.cnri.reston.va.us  Wed Feb 16 18:53:51 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 16 Feb 2000 13:53:51 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc Makefile,1.190,1.190.2.1
Message-ID: <200002161853.NAA26266@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	Makefile 
Log Message:

Use the right compression tools for each package!

Make sure the PNG icons always get bundled as well.


Index: Makefile
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/Makefile,v
retrieving revision 1.190
retrieving revision 1.190.2.1
diff -C2 -r1.190 -r1.190.2.1
*** Makefile	1999/08/02 20:20:14	1.190
--- Makefile	2000/02/16 18:53:49	1.190.2.1
***************
*** 233,241 ****
  postscript-$(PAPER)-$(RELEASE).tar.bz2: ps
  	(cd paper-$(PAPER); $(MAKE) README)
! 	(cd paper-$(PAPER); tar cf - *.ps README) | gzip -9 >$@
  
  postscript-$(PAPER)-$(RELEASE).tgz: ps
  	(cd paper-$(PAPER); $(MAKE) README)
! 	(cd paper-$(PAPER); tar cf - *.ps README) | bzip2 -9 >$@
  
  postscript-$(PAPER)-$(RELEASE).zip: ps
--- 233,241 ----
  postscript-$(PAPER)-$(RELEASE).tar.bz2: ps
  	(cd paper-$(PAPER); $(MAKE) README)
! 	(cd paper-$(PAPER); tar cf - *.ps README) | bzip2 -9 >$@
  
  postscript-$(PAPER)-$(RELEASE).tgz: ps
  	(cd paper-$(PAPER); $(MAKE) README)
! 	(cd paper-$(PAPER); tar cf - *.ps README) | gzip -9 >$@
  
  postscript-$(PAPER)-$(RELEASE).zip: ps
***************
*** 244,256 ****
  
  html-$(RELEASE).tgz:	html
! 	(cd $(HTMLDIR); tar cf - *index.html ???/*.css ???/*.html */*.gif) \
  		| gzip -9 >$@
  
  html-$(RELEASE).tar.bz2:	html
! 	(cd $(HTMLDIR); tar cf - *index.html ???/*.css ???/*.html */*.gif) \
  		| bzip2 -9 >$@
  
  html-$(RELEASE).zip:	html
! 	(cd $(HTMLDIR); zip -9 ../$@ *index.html ???/*.css ???/*.html */*.gif)
  
  # convenience targets:
--- 244,259 ----
  
  html-$(RELEASE).tgz:	html
! 	(cd $(HTMLDIR); \
! 		tar cf - *index.html ???/*.css ???/*.html */*.gif */*.png) \
  		| gzip -9 >$@
  
  html-$(RELEASE).tar.bz2:	html
! 	(cd $(HTMLDIR); \
! 		tar cf - *index.html ???/*.css ???/*.html */*.gif */*.png) \
  		| bzip2 -9 >$@
  
  html-$(RELEASE).zip:	html
! 	(cd $(HTMLDIR); \
! 		zip -9 ../$@ *index.html ???/*.css ???/*.html */*.gif */*.png)
  
  # convenience targets:



From guido@cnri.reston.va.us  Wed Feb 16 21:11:55 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 16 Feb 2000 16:11:55 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules binascii.c,2.17,2.18
Message-ID: <200002162111.QAA29345@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/src/Modules

Modified Files:
	binascii.c 
Log Message:
Patch by Jim Ahlstrom to add crc32, a useful checksum function
(e.g. used for ZIP files).

The patch includes code that says:
+  Copyright (C) 1986 Gary S. Brown.  You may use this program, or
+  code or tables extracted from it, as desired without restriction.

My interpretation (and Jim's) is that Gary S Brown has no claims under
copyright, patent or other rights or interests.  Lawyers might disagree.


Index: binascii.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/binascii.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** binascii.c	1999/10/19 19:05:14	2.17
--- binascii.c	2000/02/16 21:11:52	2.18
***************
*** 773,776 ****
--- 773,916 ----
  }
  
+ static char doc_crc32[] =
+ "(data, oldcrc = 0) -> newcrc. Compute CRC-32 incrementally";
+ 
+ /*  Crc - 32 BIT ANSI X3.66 CRC checksum files
+     Also known as: ISO 3307
+ **********************************************************************|
+ *                                                                    *|
+ * Demonstration program to compute the 32-bit CRC used as the frame  *|
+ * check sequence in ADCCP (ANSI X3.66, also known as FIPS PUB 71     *|
+ * and FED-STD-1003, the U.S. versions of CCITT's X.25 link-level     *|
+ * protocol).  The 32-bit FCS was added via the Federal Register,     *|
+ * 1 June 1982, p.23798.  I presume but don't know for certain that   *|
+ * this polynomial is or will be included in CCITT V.41, which        *|
+ * defines the 16-bit CRC (often called CRC-CCITT) polynomial.  FIPS  *|
+ * PUB 78 says that the 32-bit FCS reduces otherwise undetected       *|
+ * errors by a factor of 10^-5 over 16-bit FCS.                       *|
+ *                                                                    *|
+ **********************************************************************|
+ 
+  Copyright (C) 1986 Gary S. Brown.  You may use this program, or
+  code or tables extracted from it, as desired without restriction.
+  
+  First, the polynomial itself and its table of feedback terms.  The  
+  polynomial is                                                       
+  X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 
+  Note that we take it "backwards" and put the highest-order term in  
+  the lowest-order bit.  The X^32 term is "implied"; the LSB is the   
+  X^31 term, etc.  The X^0 term (usually shown as "+1") results in    
+  the MSB being 1.                                                    
+ 
+  Note that the usual hardware shift register implementation, which   
+  is what we're using (we're merely optimizing it by doing eight-bit  
+  chunks at a time) shifts bits into the lowest-order term.  In our   
+  implementation, that means shifting towards the right.  Why do we   
+  do it this way?  Because the calculated CRC must be transmitted in  
+  order from highest-order term to lowest-order term.  UARTs transmit 
+  characters in order from LSB to MSB.  By storing the CRC this way,  
+  we hand it to the UART in the order low-byte to high-byte; the UART 
+  sends each low-bit to hight-bit; and the result is transmission bit 
+  by bit from highest- to lowest-order term without requiring any bit 
+  shuffling on our part.  Reception works similarly.                  
+ 
+  The feedback terms table consists of 256, 32-bit entries.  Notes:   
+                                                                      
+   1. The table can be generated at runtime if desired; code to do so 
+      is shown later.  It might not be obvious, but the feedback      
+      terms simply represent the results of eight shift/xor opera-    
+      tions for all combinations of data and CRC register values.     
+                                                                      
+   2. The CRC accumulation logic is the same for all CRC polynomials, 
+      be they sixteen or thirty-two bits wide.  You simply choose the 
+      appropriate table.  Alternatively, because the table can be     
+      generated at runtime, you can start by generating the table for 
+      the polynomial in question and use exactly the same "updcrc",   
+      if your application needn't simultaneously handle two CRC       
+      polynomials.  (Note, however, that XMODEM is strange.)          
+                                                                      
+   3. For 16-bit CRCs, the table entries need be only 16 bits wide;   
+      of course, 32-bit entries work OK if the high 16 bits are zero. 
+                                                                      
+   4. The values must be right-shifted by eight bits by the "updcrc"  
+      logic; the shift must be unsigned (bring in zeroes).  On some   
+      hardware you could probably optimize the shift in assembler by  
+      using byte-swap instructions.                                   
+ ********************************************************************/
+ 
+ static unsigned long crc_32_tab[256] = {
+ 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
+ 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
+ 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
+ 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
+ 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
+ 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
+ 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
+ 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
+ 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
+ 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
+ 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
+ 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
+ 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
+ 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
+ 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
+ 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
+ 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
+ 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
+ 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
+ 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
+ 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
+ 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
+ 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
+ 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
+ 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
+ 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
+ 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
+ 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
+ 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
+ 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
+ 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
+ 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
+ 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
+ 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
+ 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
+ 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
+ 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
+ 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
+ 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
+ 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
+ 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
+ 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
+ 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
+ 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
+ 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
+ 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
+ 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
+ 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
+ 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
+ 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
+ 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
+ 0x2d02ef8dUL
+ };
+ 
+ static PyObject *
+ binascii_crc32(self, args)
+ 	PyObject *self;
+ 	PyObject *args;
+ { /* By Jim Ahlstrom; All rights transferred to CNRI */
+ 	unsigned char *bin_data;
+ 	unsigned long crc = 0UL;	/* initial value of CRC */
+ 	int len;
+ 	
+ 	if ( !PyArg_ParseTuple(args, "s#|l", &bin_data, &len, &crc) )
+ 		return NULL;
+ 
+ 	crc = crc ^ 0xFFFFFFFFUL;
+ 	while(len--)
+ 		crc = crc_32_tab[(crc ^ *bin_data++) & 0xffUL] ^ (crc >> 8);
+ 		/* Note:  (crc >> 8) MUST zero fill on left */
+ 	return Py_BuildValue("l", crc ^ 0xFFFFFFFFUL);
+ }
+ 
  /* List of functions defined in the module */
  
***************
*** 789,792 ****
--- 929,933 ----
  	 doc_rledecode_hqx},
  	{"crc_hqx",		binascii_crc_hqx,	1,	doc_crc_hqx},
+ 	{"crc32",		binascii_crc32,		1,	doc_crc32},
  	{NULL,			NULL}		/* sentinel */
  };



From guido@cnri.reston.va.us  Wed Feb 16 21:13:08 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 16 Feb 2000 16:13:08 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_binascii.py,1.4,1.5
Message-ID: <200002162113.QAA29398@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/test
In directory eric:/projects/python/develop/guido/src/Lib/test

Modified Files:
	test_binascii.py 
Log Message:
Added test for new crc32() function.


Index: test_binascii.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/test/test_binascii.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** test_binascii.py	1999/10/19 19:08:13	1.4
--- test_binascii.py	2000/02/16 21:13:06	1.5
***************
*** 85,87 ****
--- 85,93 ----
  assert res == testdata
  
+ # Test crc32()
+ crc = binascii.crc32("Test the CRC-32 of")
+ crc = binascii.crc32(" this string.", crc)
+ if crc != 1571220330:
+     print "binascii.crc32() failed."
+ 
  # The hqx test is in test_binhex.py



From guido@cnri.reston.va.us  Wed Feb 16 21:13:39 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 16 Feb 2000 16:13:39 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libbinascii.tex,1.15,1.16
Message-ID: <200002162113.QAA29419@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory eric:/projects/python/develop/guido/Doc/lib

Modified Files:
	libbinascii.tex 
Log Message:
Added docs for new crc32() function.  By Jim Ahlstrom.

(Fred, please check.)


Index: libbinascii.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libbinascii.tex,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** libbinascii.tex	1999/04/23 15:42:36	1.15
--- libbinascii.tex	2000/02/16 21:13:37	1.16
***************
*** 72,75 ****
--- 72,87 ----
  \var{crc} and returning the result.
  \end{funcdesc}
+ 
+ \begin{funcdesc}{crc32}{data\optional{, crc}}
+ Compute CRC-32, the 32-bit checksum of data, starting with an initial
+ crc.  This is consistent with the ZIP file checksum.  Use as follows:
+ \begin{verbatim}
+     print binascii.crc32("hello world")
+     # Or, in two pieces:
+     crc = binascii.crc32("hello")
+     crc = binascii.crc32(" world", crc)
+     print crc
+ \end{verbatim}
+ \end{funcdesc}
   
  \begin{excdesc}{Error}



From guido@cnri.reston.va.us  Thu Feb 17 15:12:03 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 17 Feb 2000 10:12:03 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib exceptions.py,1.16,1.17
Message-ID: <200002171512.KAA00602@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	exceptions.py 
Log Message:
Added WindowsError, for Mark Hammond's extensions.


Index: exceptions.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/exceptions.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** exceptions.py	1999/08/19 21:17:08	1.16
--- exceptions.py	2000/02/17 15:12:01	1.17
***************
*** 34,37 ****
--- 34,39 ----
        |    +-- IOError
        |    +-- OSError(*)
+       |         |
+       |         +-- WindowsError(*)
        |
        +-- EOFError
***************
*** 138,141 ****
--- 140,147 ----
  class OSError(EnvironmentError):
      """OS system call failed."""
+     pass
+ 
+ class WindowsError(OSError):
+     """MS-Windows OS system call failed."""
      pass
  



From guido@cnri.reston.va.us  Thu Feb 17 15:17:21 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 17 Feb 2000 10:17:21 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Include pyerrors.h,2.33,2.34
Message-ID: <200002171517.KAA00812@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Include
In directory eric:/projects/python/develop/guido/src/Include

Modified Files:
	pyerrors.h 
Log Message:
Declarations related to new WindowsError exception.


Index: pyerrors.h
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Include/pyerrors.h,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -r2.33 -r2.34
*** pyerrors.h	1999/06/22 14:46:42	2.33
--- pyerrors.h	2000/02/17 15:17:18	2.34
***************
*** 82,85 ****
--- 82,88 ----
  extern DL_IMPORT(PyObject *) PyExc_ValueError;
  extern DL_IMPORT(PyObject *) PyExc_ZeroDivisionError;
+ #ifdef MS_WINDOWS
+ extern DL_IMPORT(PyObject *) PyExc_WindowsError;
+ #endif
  
  extern DL_IMPORT(PyObject *) PyExc_MemoryErrorInst;
***************
*** 93,96 ****
--- 96,103 ----
  extern DL_IMPORT(PyObject *) PyErr_SetFromErrnoWithFilename Py_PROTO((PyObject *, char *));
  extern DL_IMPORT(PyObject *) PyErr_Format Py_PROTO((PyObject *, const char *, ...));
+ #ifdef MS_WINDOWS
+ extern DL_IMPORT(PyObject *) PyErr_SetFromWindowsErrWithFilename(int, const char *);
+ extern DL_IMPORT(PyObject *) PyErr_SetFromWindowsErr(int);
+ #endif
  
  extern DL_IMPORT(void) PyErr_BadInternalCall Py_PROTO((void));



From guido@cnri.reston.va.us  Thu Feb 17 15:18:13 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 17 Feb 2000 10:18:13 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python bltinmodule.c,2.147,2.148
Message-ID: <200002171518.KAA00853@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory eric:/projects/python/develop/guido/src/Python

Modified Files:
	bltinmodule.c 
Log Message:
Changes by Mark Hammond related to the new WindowsError exception.


Index: bltinmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.147
retrieving revision 2.148
diff -C2 -r2.147 -r2.148
*** bltinmodule.c	1999/12/23 14:16:55	2.147
--- bltinmodule.c	2000/02/17 15:18:10	2.148
***************
*** 2263,2266 ****
--- 2263,2269 ----
  PyObject *PyExc_ValueError;
  PyObject *PyExc_ZeroDivisionError;
+ #ifdef MS_WINDOWS
+ PyObject *PyExc_WindowsError;
+ #endif
  
  PyObject *PyExc_MemoryErrorInst;
***************
*** 2304,2307 ****
--- 2307,2313 ----
  	{"TypeError",          &PyExc_TypeError,          1},
  	{"ValueError",         &PyExc_ValueError,         1},
+ #ifdef MS_WINDOWS
+ 	{"WindowsError",       &PyExc_WindowsError,       1},
+ #endif
  	{"ZeroDivisionError",  &PyExc_ZeroDivisionError,  1},
  	{NULL, NULL}



From guido@cnri.reston.va.us  Thu Feb 17 15:19:18 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 17 Feb 2000 10:19:18 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python errors.c,2.41,2.42
Message-ID: <200002171519.KAA00878@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory eric:/projects/python/develop/guido/src/Python

Modified Files:
	errors.c 
Log Message:
Patch by Mark Hammond:

* Changes to a recent patch by Chris Tismer to errors.c.  Chris' patch
always used FormatMessage() to get the error message passing the error code
from errno - but errno and FormatMessage use a different numbering scheme.
The main reason the patch looked OK was that ENOFILE==ERROR_FILE_NOT_FOUND -
but that is about the only shared error code :-).  The MS CRT docs tell you
to use _sys_errlist()/_sys_nerr.  My patch does also this, and adds a very
similar function specifically for win32 error codes.


Index: errors.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/errors.c,v
retrieving revision 2.41
retrieving revision 2.42
diff -C2 -r2.41 -r2.42
*** errors.c	1999/04/21 15:27:31	2.41
--- errors.c	2000/02/17 15:19:15	2.42
***************
*** 290,293 ****
--- 290,296 ----
  	char *s;
  	int i = errno;
+ #ifdef MS_WIN32
+ 	char *s_buf = NULL;
+ #endif
  #ifdef EINTR
  	if (i == EINTR && PyErr_CheckSignals())
***************
*** 301,318 ****
  #else
  	{
! 		int len = FormatMessage(
! 			FORMAT_MESSAGE_ALLOCATE_BUFFER |
! 			FORMAT_MESSAGE_FROM_SYSTEM |
! 			FORMAT_MESSAGE_IGNORE_INSERTS,
! 			NULL,	/* no message source */
! 			i,
! 			MAKELANGID(LANG_NEUTRAL,
! 				   SUBLANG_DEFAULT), /* Default language */
! 			(LPTSTR) &s,
! 			0,	/* size not used */
! 			NULL);	/* no args */
! 		/* remove trailing cr/lf and dots */
! 		while (len > 0 && s[len-1] <= '.')
! 			s[--len] = '\0';
  	}
  #endif
--- 304,333 ----
  #else
  	{
! 		/* Note that the Win32 errors do not lineup with the
! 		   errno error.  So if the error is in the MSVC error
! 		   table, we use it, otherwise we assume it really _is_ 
! 		   a Win32 error code
! 		*/
! 		if (i < _sys_nerr) {
! 			s = _sys_errlist[i];
! 		}
! 		else {
! 			int len = FormatMessage(
! 				FORMAT_MESSAGE_ALLOCATE_BUFFER |
! 				FORMAT_MESSAGE_FROM_SYSTEM |
! 				FORMAT_MESSAGE_IGNORE_INSERTS,
! 				NULL,	/* no message source */
! 				i,
! 				MAKELANGID(LANG_NEUTRAL,
! 					   SUBLANG_DEFAULT),
! 				           /* Default language */
! 				(LPTSTR) &s_buf,
! 				0,	/* size not used */
! 				NULL);	/* no args */
! 			s = s_buf;
! 			/* remove trailing cr/lf and dots */
! 			while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.'))
! 				s[--len] = '\0';
! 		}
  	}
  #endif
***************
*** 326,330 ****
  	}
  #ifdef MS_WIN32
! 	LocalFree(s);
  #endif
  	return NULL;
--- 341,345 ----
  	}
  #ifdef MS_WIN32
! 	LocalFree(s_buf);
  #endif
  	return NULL;
***************
*** 338,341 ****
--- 353,401 ----
  	return PyErr_SetFromErrnoWithFilename(exc, NULL);
  }
+ 
+ #ifdef MS_WINDOWS 
+ /* Windows specific error code handling */
+ PyObject *PyErr_SetFromWindowsErrWithFilename(
+ 	int ierr, 
+ 	const char *filename)
+ {
+ 	int len;
+ 	char *s;
+ 	PyObject *v;
+ 	DWORD err = (DWORD)ierr;
+ 	if (err==0) err = GetLastError();
+ 	len = FormatMessage(
+ 		/* Error API error */
+ 		FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ 		FORMAT_MESSAGE_FROM_SYSTEM |
+ 		FORMAT_MESSAGE_IGNORE_INSERTS,
+ 		NULL,	/* no message source */
+ 		err,
+ 		MAKELANGID(LANG_NEUTRAL,
+ 		SUBLANG_DEFAULT), /* Default language */
+ 		(LPTSTR) &s,
+ 		0,	/* size not used */
+ 		NULL);	/* no args */
+ 	/* remove trailing cr/lf and dots */
+ 	while (len > 0 && (s[len-1] <= ' ' || s[len-1] == '.'))
+ 		s[--len] = '\0';
+ 	if (filename != NULL && Py_UseClassExceptionsFlag)
+ 		v = Py_BuildValue("(iss)", err, s, filename);
+ 	else
+ 		v = Py_BuildValue("(is)", err, s);
+ 	if (v != NULL) {
+ 		PyErr_SetObject(PyExc_EnvironmentError, v);
+ 		Py_DECREF(v);
+ 	}
+ 	LocalFree(s);
+ 	return NULL;
+ }
+ 
+ PyObject *PyErr_SetFromWindowsErr(int ierr)
+ {
+ 	return PyErr_SetFromWindowsErrWithFilename(ierr, NULL);
+ 
+ }
+ #endif /* MS_WINDOWS */
  
  void



From guido@cnri.reston.va.us  Thu Feb 17 16:14:19 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 17 Feb 2000 11:14:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle EditorWindow.py,1.29,1.30
Message-ID: <200002171614.LAA01105@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	EditorWindow.py 
Log Message:
Add primitive customization of window size and font.
A few alternative selections can be made by changing "if 0" to "if 1".


Index: EditorWindow.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/EditorWindow.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** EditorWindow.py	2000/02/15 18:05:15	1.29
--- EditorWindow.py	2000/02/17 16:14:16	1.30
***************
*** 10,13 ****
--- 10,30 ----
  import WindowList
  
+ # Customization of default window size and font
+ # standard
+ WIDTH = 80
+ HEIGHT = 24
+ if sys.platform[:3] == 'win':
+     FONT = ("courier new", 10)
+ else:
+     FONT = ("courier", 10)
+ if 0:
+     # for demos (on Windows)
+     WIDTH = 70
+     HEIGHT = 16
+     FONT = ("lucida console", 14)
+ if 0:
+     # for Windows 98
+     FONT = ("lucida console", 8)
+ 
  # The default tab setting for a Text widget, in average-width characters.
  TK_TABWIDTH_DEFAULT = 8
***************
*** 110,113 ****
--- 127,131 ----
                                  highlightbackground=cprefs.CHilite[1],
                                  insertbackground=cprefs.CCursor[1],
+                                 width=WIDTH, height=HEIGHT,
                                  wrap="none")
  
***************
*** 139,145 ****
  
          text['yscrollcommand'] = vbar.set
!         if sys.platform[:3] == 'win':
!             text['font'] = ("lucida console", 8)
! #            text['font'] = ("courier new", 10)
          text_frame.pack(side=LEFT, fill=BOTH, expand=1)
          text.pack(side=TOP, fill=BOTH, expand=1)
--- 157,161 ----
  
          text['yscrollcommand'] = vbar.set
!         text['font'] = FONT
          text_frame.pack(side=LEFT, fill=BOTH, expand=1)
          text.pack(side=TOP, fill=BOTH, expand=1)



From guido@cnri.reston.va.us  Thu Feb 17 17:12:42 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 17 Feb 2000 12:12:42 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib imaplib.py,1.14,1.15
Message-ID: <200002171712.MAA01255@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	imaplib.py 
Log Message:
Patches by Piers Lauder.

Reasons for patches:

1st patch (15,21):
	version change

2nd patch (66,72):
	This is a patch I found in a Zope product release (quite by accident!).
	It relaxes the conditions for matching a literal. I've looked over the
	logic, and tested it, and it seems sensible.

3rd patch (117,123):
	It appears the quoting matcher was too general, and that the IMAP4
	protocol requires characters like ':' in commands to be unquoted.
	(This is the patch already sent to Guido.)

4th patch (699,705):
	Spelling correction in comment.

5th patch (753,761):
	Another patch from the Zope product. It seems that some IMAP4 servers
	produce unexpected responses in the middle of valid command/response
	sequences. This patch ignores the unexpected responses in this
	situation. (How I wish users would send me bug reports with examples!).

last 2 patches: (1015,1028) (1038,1044):
	Minor improvements to test code.


Index: imaplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imaplib.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** imaplib.py	1999/12/13 23:27:45	1.14
--- imaplib.py	2000/02/17 17:12:39	1.15
***************
*** 16,20 ****
  """
  
! __version__ = "2.16"
  
  import binascii, re, socket, string, time, random, sys
--- 16,20 ----
  """
  
! __version__ = "2.30"
  
  import binascii, re, socket, string, time, random, sys
***************
*** 67,71 ****
  	r' (?P<zonen>[-+])(?P<zoneh>[0-9][0-9])(?P<zonem>[0-9][0-9])'
  	r'"')
! Literal = re.compile(r'(?P<data>.*) {(?P<size>\d+)}$')
  Response_code = re.compile(r'\[(?P<type>[A-Z-]+)( (?P<data>[^\]]*))?\]')
  Untagged_response = re.compile(r'\* (?P<type>[A-Z-]+)( (?P<data>.*))?')
--- 67,71 ----
  	r' (?P<zonen>[-+])(?P<zoneh>[0-9][0-9])(?P<zonem>[0-9][0-9])'
  	r'"')
! Literal = re.compile(r'.*{(?P<size>\d+)}$')
  Response_code = re.compile(r'\[(?P<type>[A-Z-]+)( (?P<data>[^\]]*))?\]')
  Untagged_response = re.compile(r'\* (?P<type>[A-Z-]+)( (?P<data>.*))?')
***************
*** 118,122 ****
  	class readonly(abort): pass	# Mailbox status changed to READ-ONLY
  
! 	mustquote = re.compile(r'\W')	# Match any non-alphanumeric character
  
  	def __init__(self, host = '', port = IMAP4_PORT):
--- 118,122 ----
  	class readonly(abort): pass	# Mailbox status changed to READ-ONLY
  
! 	mustquote = re.compile(r"[^\w!#$%&'*+,.:;<=>?^`|~-]")
  
  	def __init__(self, host = '', port = IMAP4_PORT):
***************
*** 700,704 ****
  
  			if self.mo is None:
! 				# Only other possibility is '+' (continuation) rsponse...
  
  				if self._match(Continuation, resp):
--- 700,704 ----
  
  			if self.mo is None:
! 				# Only other possibility is '+' (continuation) response...
  
  				if self._match(Continuation, resp):
***************
*** 754,760 ****
  				del self.tagged_commands[tag]
  				return result
- 			self._get_response()
  
  
  	def _get_line(self):
  
--- 754,772 ----
  				del self.tagged_commands[tag]
  				return result
  
+ 			# Some have reported "unexpected response" exceptions.
+ 			# (Isn't this non-IMAP4-compliant behaviour?
+ 			# Please mail me details printed below!)
+ 			# Anyway, ignore them here.
  
+ 			try:
+ 				self._get_response()
+ 			except self.abort, val:
+ 				if __debug__:
+ 					if self.debug >= 1:
+ 						_mesg('abort exception ignored: %s' % val)
+ 						print_log()
+ 
+ 
  	def _get_line(self):
  
***************
*** 1016,1021 ****
  
  	USER = getpass.getuser()
! 	PASSWD = getpass.getpass("IMAP password for %s: " % (host or "localhost"))
  
  	test_seq1 = (
  	('login', (USER, PASSWD)),
--- 1028,1034 ----
  
  	USER = getpass.getuser()
! 	PASSWD = getpass.getpass("IMAP password for %s on %s" % (USER, host or "localhost"))
  
+ 	test_mesg = 'From: %s@localhost\nSubject: IMAP4 test\n\ndata...\n' % USER
  	test_seq1 = (
  	('login', (USER, PASSWD)),
***************
*** 1023,1027 ****
  	('rename', ('/tmp/xxx 1', '/tmp/yyy')),
  	('CREATE', ('/tmp/yyz 2',)),
! 	('append', ('/tmp/yyz 2', None, None, 'From: anon@x.y.z\n\ndata...')),
  	('list', ('/tmp', 'yy*')),
  	('select', ('/tmp/yyz 2',)),
--- 1036,1040 ----
  	('rename', ('/tmp/xxx 1', '/tmp/yyy')),
  	('CREATE', ('/tmp/yyz 2',)),
! 	('append', ('/tmp/yyz 2', None, None, test_mesg)),
  	('list', ('/tmp', 'yy*')),
  	('select', ('/tmp/yyz 2',)),
***************
*** 1039,1043 ****
  	('uid', ('SEARCH', 'ALL')),
  	('response', ('EXISTS',)),
! 	('append', (None, None, None, 'From: anon@x.y.z\n\ndata...')),
  	('recent', ()),
  	('logout', ()),
--- 1052,1056 ----
  	('uid', ('SEARCH', 'ALL')),
  	('response', ('EXISTS',)),
! 	('append', (None, None, None, test_mesg)),
  	('recent', ()),
  	('logout', ()),



From fdrake@weyr.cnri.reston.va.us  Thu Feb 17 17:30:43 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 17 Feb 2000 12:30:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib ntpath.py,1.22,1.23
Message-ID: <200002171730.MAA29335@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	ntpath.py 
Log Message:

Typo in a comment:  "wheter" --> "whether"


Index: ntpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ntpath.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** ntpath.py	2000/02/02 16:54:39	1.22
--- ntpath.py	2000/02/17 17:30:40	1.23
***************
*** 22,26 ****
  
  
! # Return wheter a path is absolute.
  # Trivial in Posix, harder on the Mac or MS-DOS.
  # For DOS it is absolute if it starts with a slash or backslash (current
--- 22,26 ----
  
  
! # Return whether a path is absolute.
  # Trivial in Posix, harder on the Mac or MS-DOS.
  # For DOS it is absolute if it starts with a slash or backslash (current



From fdrake@weyr.cnri.reston.va.us  Thu Feb 17 17:37:09 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 17 Feb 2000 12:37:09 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc Makefile,1.190.2.1,1.190.2.2
Message-ID: <200002171737.MAA29395@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	Makefile 
Log Message:

Don't include */*.png in the tarballs; they only exist on the head
branch of the CVS repository, not on the 1.5.2 maintenance branch.


Index: Makefile
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/Makefile,v
retrieving revision 1.190.2.1
retrieving revision 1.190.2.2
diff -C2 -r1.190.2.1 -r1.190.2.2
*** Makefile	2000/02/16 18:53:49	1.190.2.1
--- Makefile	2000/02/17 17:37:06	1.190.2.2
***************
*** 245,259 ****
  html-$(RELEASE).tgz:	html
  	(cd $(HTMLDIR); \
! 		tar cf - *index.html ???/*.css ???/*.html */*.gif */*.png) \
  		| gzip -9 >$@
  
  html-$(RELEASE).tar.bz2:	html
  	(cd $(HTMLDIR); \
! 		tar cf - *index.html ???/*.css ???/*.html */*.gif */*.png) \
  		| bzip2 -9 >$@
  
  html-$(RELEASE).zip:	html
  	(cd $(HTMLDIR); \
! 		zip -9 ../$@ *index.html ???/*.css ???/*.html */*.gif */*.png)
  
  # convenience targets:
--- 245,259 ----
  html-$(RELEASE).tgz:	html
  	(cd $(HTMLDIR); \
! 		tar cf - *index.html ???/*.css ???/*.html */*.gif) \
  		| gzip -9 >$@
  
  html-$(RELEASE).tar.bz2:	html
  	(cd $(HTMLDIR); \
! 		tar cf - *index.html ???/*.css ???/*.html */*.gif) \
  		| bzip2 -9 >$@
  
  html-$(RELEASE).zip:	html
  	(cd $(HTMLDIR); \
! 		zip -9 ../$@ *index.html ???/*.css ???/*.html */*.gif)
  
  # convenience targets:



From fdrake@weyr.cnri.reston.va.us  Thu Feb 17 17:45:55 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 17 Feb 2000 12:45:55 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libfuncs.tex,1.60,1.61
Message-ID: <200002171745.MAA29518@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc/lib

Modified Files:
	libfuncs.tex 
Log Message:

Update the description of int() to include the radix parameter;
omission noted on c.l.py by Aahz Maruch.

Swapped the order of the descriptions of int() and intern() so that
int() comes first (the functions are in alphabetic order).


Index: libfuncs.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libfuncs.tex,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** libfuncs.tex	1999/08/05 13:43:08	1.60
--- libfuncs.tex	2000/02/17 17:45:52	1.61
***************
*** 313,316 ****
--- 313,332 ----
  \end{funcdesc}
  
+ \begin{funcdesc}{int}{x\optional{, radix}}
+   Convert a string or number to a plain integer.  If the argument is a
+   string, it must contain a possibly signed decimal number
+   representable as a Python integer, possibly embedded in whitespace;
+   this behaves identical to \code{string.atoi(\var{x}\optional{,
+   \var{radix}})}.  The \var{radix} parameter gives the base for the
+   conversion and may be any integer in the range $[2, 36]$.  If
+   \var{radix} is specified and \var{x} is not a string,
+   \exception{TypeError} is raised.
+   Otherwise, the argument may be a plain or
+   long integer or a floating point number.  Conversion of floating
+   point numbers to integers is defined by the C semantics; normally
+   the conversion truncates towards zero.\footnote{This is ugly --- the
+   language definition should require truncation towards zero.}
+ \end{funcdesc}
+ 
  \begin{funcdesc}{intern}{string}
    Enter \var{string} in the table of ``interned'' strings and return
***************
*** 324,339 ****
    have interned keys.  Interned strings are immortal (i.e. never get
    garbage collected).
- \end{funcdesc}
- 
- \begin{funcdesc}{int}{x}
-   Convert a string or number to a plain integer.  If the argument is a
-   string, it must contain a possibly signed decimal number
-   representable as a Python integer, possibly embedded in whitespace;
-   this behaves identical to \code{string.atoi(\var{x})}.
-   Otherwise, the argument may be a plain or
-   long integer or a floating point number.  Conversion of floating
-   point numbers to integers is defined by the C semantics; normally
-   the conversion truncates towards zero.\footnote{This is ugly --- the
-   language definition should require truncation towards zero.}
  \end{funcdesc}
  
--- 340,343 ----



From jhylton@cnri.reston.va.us  Thu Feb 17 17:56:33 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Thu, 17 Feb 2000 12:56:33 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler compile.py,1.15,1.16
Message-ID: <200002171756.MAA21312@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	compile.py 
Log Message:
satisfy the tabnanny
fix broken references to filename var in generateXXX methods


Index: compile.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/compile.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** compile.py	2000/02/16 00:55:44	1.15
--- compile.py	2000/02/17 17:56:29	1.16
***************
*** 81,85 ****
  
      def __init__(self):
! 	self.node = None
  
      def preorder(self, tree, visitor):
--- 81,85 ----
  
      def __init__(self):
!         self.node = None
  
      def preorder(self, tree, visitor):
***************
*** 164,170 ****
      def __init__(self, filename="<?>"):
          self.filename = filename
! 	self.code = PyAssembler()
          self.code.setFlags(0)
! 	self.locals = misc.Stack()
          self.loops = misc.Stack()
          self.namespace = 0
--- 164,170 ----
      def __init__(self, filename="<?>"):
          self.filename = filename
!         self.code = PyAssembler()
          self.code.setFlags(0)
!         self.locals = misc.Stack()
          self.loops = misc.Stack()
          self.namespace = 0
***************
*** 173,188 ****
  
      def emit(self, *args):
! 	# XXX could just use self.emit = self.code.emit
! 	apply(self.code.emit, args)
  
      def _generateFunctionOrLambdaCode(self, func):
          self.name = func.name
!         self.filename = filename
! 
          # keep a lookout for 'def foo((x,y)):'
          args, hasTupleArg = self.generateArglist(func.argnames)
          
! 	self.code = PyAssembler(args=args, name=func.name,
!                                  filename=filename)
          self.namespace = self.OPTIMIZED
          if func.varargs:
--- 173,187 ----
  
      def emit(self, *args):
!         # XXX could just use self.emit = self.code.emit
!         apply(self.code.emit, args)
  
      def _generateFunctionOrLambdaCode(self, func):
          self.name = func.name
!  
          # keep a lookout for 'def foo((x,y)):'
          args, hasTupleArg = self.generateArglist(func.argnames)
          
!         self.code = PyAssembler(args=args, name=func.name,
!                                 filename=self.filename)
          self.namespace = self.OPTIMIZED
          if func.varargs:
***************
*** 192,197 ****
          lnf = walk(func.code, LocalNameFinder(args), 0)
          self.locals.push(lnf.getLocals())
! 	self.emit('SET_LINENO', func.lineno)
! 	if hasTupleArg:
              self.generateArgUnpack(func.argnames)
          walk(func.code, self)
--- 191,196 ----
          lnf = walk(func.code, LocalNameFinder(args), 0)
          self.locals.push(lnf.getLocals())
!         self.emit('SET_LINENO', func.lineno)
!         if hasTupleArg:
              self.generateArgUnpack(func.argnames)
          walk(func.code, self)
***************
*** 240,244 ****
      def generateClassCode(self, klass):
          self.code = PyAssembler(name=klass.name,
!                                  filename=filename)
          self.emit('SET_LINENO', klass.lineno)
          lnf = walk(klass.code, LocalNameFinder(), 0)
--- 239,243 ----
      def generateClassCode(self, klass):
          self.code = PyAssembler(name=klass.name,
!                                  filename=self.filename)
          self.emit('SET_LINENO', klass.lineno)
          lnf = walk(klass.code, LocalNameFinder(), 0)
***************
*** 255,259 ****
  
      def isLocalName(self, name):
! 	return self.locals.top().has_elt(name)
  
      def _nameOp(self, prefix, name):
--- 254,258 ----
  
      def isLocalName(self, name):
!         return self.locals.top().has_elt(name)
  
      def _nameOp(self, prefix, name):
***************
*** 291,296 ****
  
      def visitModule(self, node):
! 	lnf = walk(node.node, LocalNameFinder(), 0)
! 	self.locals.push(lnf.getLocals())
          self.visit(node.node)
          self.emit('LOAD_CONST', None)
--- 290,295 ----
  
      def visitModule(self, node):
!         lnf = walk(node.node, LocalNameFinder(), 0)
!         self.locals.push(lnf.getLocals())
          self.visit(node.node)
          self.emit('LOAD_CONST', None)
***************
*** 354,366 ****
          if hasattr(node, 'lineno'):
              self.emit('SET_LINENO', node.lineno)
! 	self.visit(node.node)
! 	for arg in node.args:
! 	    self.visit(arg)
              if isinstance(arg, ast.Keyword):
                  kw = kw + 1
              else:
                  pos = pos + 1
! 	self.emit('CALL_FUNCTION', kw << 8 | pos)
! 	return 1
  
      def visitKeyword(self, node):
--- 353,365 ----
          if hasattr(node, 'lineno'):
              self.emit('SET_LINENO', node.lineno)
!         self.visit(node.node)
!         for arg in node.args:
!             self.visit(arg)
              if isinstance(arg, ast.Keyword):
                  kw = kw + 1
              else:
                  pos = pos + 1
!         self.emit('CALL_FUNCTION', kw << 8 | pos)
!         return 1
  
      def visitKeyword(self, node):
***************
*** 370,391 ****
  
      def visitIf(self, node):
! 	after = StackRef()
! 	for test, suite in node.tests:
              if hasattr(test, 'lineno'):
                  self.emit('SET_LINENO', test.lineno)
              else:
                  print "warning", "no line number"
! 	    self.visit(test)
! 	    dest = StackRef()
! 	    self.emit('JUMP_IF_FALSE', dest)
! 	    self.emit('POP_TOP')
! 	    self.visit(suite)
! 	    self.emit('JUMP_FORWARD', after)
! 	    dest.bind(self.code.getCurInst())
! 	    self.emit('POP_TOP')
! 	if node.else_:
! 	    self.visit(node.else_)
! 	after.bind(self.code.getCurInst())
! 	return 1
  
      def startLoop(self):
--- 369,390 ----
  
      def visitIf(self, node):
!         after = StackRef()
!         for test, suite in node.tests:
              if hasattr(test, 'lineno'):
                  self.emit('SET_LINENO', test.lineno)
              else:
                  print "warning", "no line number"
!             self.visit(test)
!             dest = StackRef()
!             self.emit('JUMP_IF_FALSE', dest)
!             self.emit('POP_TOP')
!             self.visit(suite)
!             self.emit('JUMP_FORWARD', after)
!             dest.bind(self.code.getCurInst())
!             self.emit('POP_TOP')
!         if node.else_:
!             self.visit(node.else_)
!         after.bind(self.code.getCurInst())
!         return 1
  
      def startLoop(self):
***************
*** 517,578 ****
  
      def visitCompare(self, node):
! 	"""Comment from compile.c follows:
  
! 	The following code is generated for all but the last
! 	comparison in a chain:
! 	   
! 	label:	on stack:	opcode:		jump to:
! 	   
! 		a		<code to load b>
! 		a, b		DUP_TOP
! 		a, b, b		ROT_THREE
! 		b, a, b		COMPARE_OP
! 		b, 0-or-1	JUMP_IF_FALSE	L1
! 		b, 1		POP_TOP
! 		b		
! 	
! 	We are now ready to repeat this sequence for the next
! 	comparison in the chain.
! 	   
! 	For the last we generate:
! 	   
! 	   	b		<code to load c>
! 	   	b, c		COMPARE_OP
! 	   	0-or-1		
! 	   
! 	If there were any jumps to L1 (i.e., there was more than one
! 	comparison), we generate:
! 	   
! 	   	0-or-1		JUMP_FORWARD	L2
! 	   L1:	b, 0		ROT_TWO
! 	   	0, b		POP_TOP
! 	   	0
! 	   L2:	0-or-1
! 	"""
! 	self.visit(node.expr)
! 	# if refs are never emitted, subsequent bind call has no effect
! 	l1 = StackRef()
! 	l2 = StackRef()
! 	for op, code in node.ops[:-1]:
! 	    # emit every comparison except the last
! 	    self.visit(code)
! 	    self.emit('DUP_TOP')
! 	    self.emit('ROT_THREE')
! 	    self.emit('COMPARE_OP', op)
              # dupTop and compareOp cancel stack effect
! 	    self.emit('JUMP_IF_FALSE', l1)
! 	    self.emit('POP_TOP')
! 	if node.ops:
! 	    # emit the last comparison
! 	    op, code = node.ops[-1]
! 	    self.visit(code)
! 	    self.emit('COMPARE_OP', op)
! 	if len(node.ops) > 1:
! 	    self.emit('JUMP_FORWARD', l2)
! 	    l1.bind(self.code.getCurInst())
! 	    self.emit('ROT_TWO')
! 	    self.emit('POP_TOP')
! 	    l2.bind(self.code.getCurInst())
! 	return 1
  
      def visitGetattr(self, node):
--- 516,577 ----
  
      def visitCompare(self, node):
!         """Comment from compile.c follows:
  
!         The following code is generated for all but the last
!         comparison in a chain:
!            
!         label:  on stack:       opcode:         jump to:
!            
!                 a               <code to load b>
!                 a, b            DUP_TOP
!                 a, b, b         ROT_THREE
!                 b, a, b         COMPARE_OP
!                 b, 0-or-1       JUMP_IF_FALSE   L1
!                 b, 1            POP_TOP
!                 b               
!         
!         We are now ready to repeat this sequence for the next
!         comparison in the chain.
!            
!         For the last we generate:
!            
!                 b               <code to load c>
!                 b, c            COMPARE_OP
!                 0-or-1          
!            
!         If there were any jumps to L1 (i.e., there was more than one
!         comparison), we generate:
!            
!                 0-or-1          JUMP_FORWARD    L2
!            L1:  b, 0            ROT_TWO
!                 0, b            POP_TOP
!                 0
!            L2:  0-or-1
!         """
!         self.visit(node.expr)
!         # if refs are never emitted, subsequent bind call has no effect
!         l1 = StackRef()
!         l2 = StackRef()
!         for op, code in node.ops[:-1]:
!             # emit every comparison except the last
!             self.visit(code)
!             self.emit('DUP_TOP')
!             self.emit('ROT_THREE')
!             self.emit('COMPARE_OP', op)
              # dupTop and compareOp cancel stack effect
!             self.emit('JUMP_IF_FALSE', l1)
!             self.emit('POP_TOP')
!         if node.ops:
!             # emit the last comparison
!             op, code = node.ops[-1]
!             self.visit(code)
!             self.emit('COMPARE_OP', op)
!         if len(node.ops) > 1:
!             self.emit('JUMP_FORWARD', l2)
!             l1.bind(self.code.getCurInst())
!             self.emit('ROT_TWO')
!             self.emit('POP_TOP')
!             l2.bind(self.code.getCurInst())
!         return 1
  
      def visitGetattr(self, node):
***************
*** 591,595 ****
          elif node.flags == 'OP_ASSIGN':
              self.emit('STORE_SUBSCR')
! 	elif node.flags == 'OP_DELETE':
              self.emit('DELETE_SUBSCR')
          return 1
--- 590,594 ----
          elif node.flags == 'OP_ASSIGN':
              self.emit('STORE_SUBSCR')
!         elif node.flags == 'OP_DELETE':
              self.emit('DELETE_SUBSCR')
          return 1
***************
*** 625,633 ****
          self.emit('SET_LINENO', node.lineno)
          self.visit(node.expr)
! 	dups = len(node.nodes) - 1
          for i in range(len(node.nodes)):
! 	    elt = node.nodes[i]
! 	    if i < dups:
! 		self.emit('DUP_TOP')
              if isinstance(elt, ast.Node):
                  self.visit(elt)
--- 624,632 ----
          self.emit('SET_LINENO', node.lineno)
          self.visit(node.expr)
!         dups = len(node.nodes) - 1
          for i in range(len(node.nodes)):
!             elt = node.nodes[i]
!             if i < dups:
!                 self.emit('DUP_TOP')
              if isinstance(elt, ast.Node):
                  self.visit(elt)
***************
*** 660,667 ****
  
      def binaryOp(self, node, op):
! 	self.visit(node.left)
! 	self.visit(node.right)
! 	self.emit(op)
! 	return 1
  
      def unaryOp(self, node, op):
--- 659,666 ----
  
      def binaryOp(self, node, op):
!         self.visit(node.left)
!         self.visit(node.right)
!         self.emit(op)
!         return 1
  
      def unaryOp(self, node, op):
***************
*** 671,696 ****
  
      def visitAdd(self, node):
! 	return self.binaryOp(node, 'BINARY_ADD')
  
      def visitSub(self, node):
! 	return self.binaryOp(node, 'BINARY_SUBTRACT')
  
      def visitMul(self, node):
! 	return self.binaryOp(node, 'BINARY_MULTIPLY')
  
      def visitDiv(self, node):
! 	return self.binaryOp(node, 'BINARY_DIVIDE')
  
      def visitMod(self, node):
! 	return self.binaryOp(node, 'BINARY_MODULO')
  
      def visitPower(self, node):
! 	return self.binaryOp(node, 'BINARY_POWER')
  
      def visitLeftShift(self, node):
! 	return self.binaryOp(node, 'BINARY_LSHIFT')
  
      def visitRightShift(self, node):
! 	return self.binaryOp(node, 'BINARY_RSHIFT')
  
      def visitInvert(self, node):
--- 670,695 ----
  
      def visitAdd(self, node):
!         return self.binaryOp(node, 'BINARY_ADD')
  
      def visitSub(self, node):
!         return self.binaryOp(node, 'BINARY_SUBTRACT')
  
      def visitMul(self, node):
!         return self.binaryOp(node, 'BINARY_MULTIPLY')
  
      def visitDiv(self, node):
!         return self.binaryOp(node, 'BINARY_DIVIDE')
  
      def visitMod(self, node):
!         return self.binaryOp(node, 'BINARY_MODULO')
  
      def visitPower(self, node):
!         return self.binaryOp(node, 'BINARY_POWER')
  
      def visitLeftShift(self, node):
!         return self.binaryOp(node, 'BINARY_LSHIFT')
  
      def visitRightShift(self, node):
!         return self.binaryOp(node, 'BINARY_RSHIFT')
  
      def visitInvert(self, node):
***************
*** 713,730 ****
  
      def bitOp(self, nodes, op):
! 	self.visit(nodes[0])
! 	for node in nodes[1:]:
! 	    self.visit(node)
! 	    self.emit(op)
! 	return 1
  
      def visitBitand(self, node):
! 	return self.bitOp(node.nodes, 'BINARY_AND')
  
      def visitBitor(self, node):
! 	return self.bitOp(node.nodes, 'BINARY_OR')
  
      def visitBitxor(self, node):
! 	return self.bitOp(node.nodes, 'BINARY_XOR')
  
      def visitTest(self, node, jump):
--- 712,729 ----
  
      def bitOp(self, nodes, op):
!         self.visit(nodes[0])
!         for node in nodes[1:]:
!             self.visit(node)
!             self.emit(op)
!         return 1
  
      def visitBitand(self, node):
!         return self.bitOp(node.nodes, 'BINARY_AND')
  
      def visitBitor(self, node):
!         return self.bitOp(node.nodes, 'BINARY_OR')
  
      def visitBitxor(self, node):
!         return self.bitOp(node.nodes, 'BINARY_XOR')
  
      def visitTest(self, node, jump):
***************
*** 739,758 ****
  
      def visitAssert(self, node):
! 	# XXX __debug__ and AssertionError appear to be special cases
! 	# -- they are always loaded as globals even if there are local
! 	# names.  I guess this is a sort of renaming op.
! 	skip = StackRef()
! 	self.emit('SET_LINENO', node.lineno)
! 	self.emit('LOAD_GLOBAL', '__debug__')
! 	self.emit('JUMP_IF_FALSE', skip)
! 	self.emit('POP_TOP')
! 	self.visit(node.test)
! 	self.emit('JUMP_IF_TRUE', skip)
! 	self.emit('LOAD_GLOBAL', 'AssertionError')
! 	self.visit(node.fail)
! 	self.emit('RAISE_VARARGS', 2)
! 	skip.bind(self.code.getCurInst())
! 	self.emit('POP_TOP')
! 	return 1
  
      def visitAnd(self, node):
--- 738,757 ----
  
      def visitAssert(self, node):
!         # XXX __debug__ and AssertionError appear to be special cases
!         # -- they are always loaded as globals even if there are local
!         # names.  I guess this is a sort of renaming op.
!         skip = StackRef()
!         self.emit('SET_LINENO', node.lineno)
!         self.emit('LOAD_GLOBAL', '__debug__')
!         self.emit('JUMP_IF_FALSE', skip)
!         self.emit('POP_TOP')
!         self.visit(node.test)
!         self.emit('JUMP_IF_TRUE', skip)
!         self.emit('LOAD_GLOBAL', 'AssertionError')
!         self.visit(node.fail)
!         self.emit('RAISE_VARARGS', 2)
!         skip.bind(self.code.getCurInst())
!         self.emit('POP_TOP')
!         return 1
  
      def visitAnd(self, node):
***************
*** 766,775 ****
  
      def visitConst(self, node):
! 	self.emit('LOAD_CONST', node.value)
          return 1
  
      def visitEllipsis(self, node):
! 	self.emit('LOAD_CONST', Ellipsis)
! 	return 1
  
      def visitTuple(self, node):
--- 765,774 ----
  
      def visitConst(self, node):
!         self.emit('LOAD_CONST', node.value)
          return 1
  
      def visitEllipsis(self, node):
!         self.emit('LOAD_CONST', Ellipsis)
!         return 1
  
      def visitTuple(self, node):
***************
*** 786,850 ****
  
      def visitDict(self, node):
! 	self.emit('BUILD_MAP', 0)
! 	for k, v in node.items:
! 	    # XXX need to add set lineno when there aren't constants
! 	    self.emit('DUP_TOP')
! 	    self.visit(v)
! 	    self.emit('ROT_TWO')
! 	    self.visit(k)
! 	    self.emit('STORE_SUBSCR')
! 	return 1
  
      def visitReturn(self, node):
! 	self.emit('SET_LINENO', node.lineno)
! 	self.visit(node.value)
! 	self.emit('RETURN_VALUE')
! 	return 1
  
      def visitRaise(self, node):
! 	self.emit('SET_LINENO', node.lineno)
! 	n = 0
! 	if node.expr1:
! 	    self.visit(node.expr1)
! 	    n = n + 1
! 	if node.expr2:
! 	    self.visit(node.expr2)
! 	    n = n + 1
! 	if node.expr3:
! 	    self.visit(node.expr3)
! 	    n = n + 1
! 	self.emit('RAISE_VARARGS', n)
! 	return 1
  
      def visitPrint(self, node):
! 	self.emit('SET_LINENO', node.lineno)
! 	for child in node.nodes:
! 	    self.visit(child)
! 	    self.emit('PRINT_ITEM')
! 	return 1
  
      def visitPrintnl(self, node):
! 	self.visitPrint(node)
! 	self.emit('PRINT_NEWLINE')
! 	return 1
  
      def visitExec(self, node):
! 	self.visit(node.expr)
! 	if node.locals is None:
! 	    self.emit('LOAD_CONST', None)
! 	else:
! 	    self.visit(node.locals)
! 	if node.globals is None:
! 	    self.emit('DUP_TOP')
! 	else:
! 	    self.visit(node.globals)
! 	self.emit('EXEC_STMT')
  
  class LocalNameFinder:
      def __init__(self, names=()):
! 	self.names = misc.Set()
          self.globals = misc.Set()
! 	for name in names:
! 	    self.names.add(name)
  
      def getLocals(self):
--- 785,849 ----
  
      def visitDict(self, node):
!         self.emit('BUILD_MAP', 0)
!         for k, v in node.items:
!             # XXX need to add set lineno when there aren't constants
!             self.emit('DUP_TOP')
!             self.visit(v)
!             self.emit('ROT_TWO')
!             self.visit(k)
!             self.emit('STORE_SUBSCR')
!         return 1
  
      def visitReturn(self, node):
!         self.emit('SET_LINENO', node.lineno)
!         self.visit(node.value)
!         self.emit('RETURN_VALUE')
!         return 1
  
      def visitRaise(self, node):
!         self.emit('SET_LINENO', node.lineno)
!         n = 0
!         if node.expr1:
!             self.visit(node.expr1)
!             n = n + 1
!         if node.expr2:
!             self.visit(node.expr2)
!             n = n + 1
!         if node.expr3:
!             self.visit(node.expr3)
!             n = n + 1
!         self.emit('RAISE_VARARGS', n)
!         return 1
  
      def visitPrint(self, node):
!         self.emit('SET_LINENO', node.lineno)
!         for child in node.nodes:
!             self.visit(child)
!             self.emit('PRINT_ITEM')
!         return 1
  
      def visitPrintnl(self, node):
!         self.visitPrint(node)
!         self.emit('PRINT_NEWLINE')
!         return 1
  
      def visitExec(self, node):
!         self.visit(node.expr)
!         if node.locals is None:
!             self.emit('LOAD_CONST', None)
!         else:
!             self.visit(node.locals)
!         if node.globals is None:
!             self.emit('DUP_TOP')
!         else:
!             self.visit(node.globals)
!         self.emit('EXEC_STMT')
  
  class LocalNameFinder:
      def __init__(self, names=()):
!         self.names = misc.Set()
          self.globals = misc.Set()
!         for name in names:
!             self.names.add(name)
  
      def getLocals(self):
***************
*** 852,859 ****
              if self.names.has_elt(elt):
                  self.names.remove(elt)
! 	return self.names
  
      def visitDict(self, node):
! 	return 1
  
      def visitGlobal(self, node):
--- 851,858 ----
              if self.names.has_elt(elt):
                  self.names.remove(elt)
!         return self.names
  
      def visitDict(self, node):
!         return 1
  
      def visitGlobal(self, node):
***************
*** 864,868 ****
      def visitFunction(self, node):
          self.names.add(node.name)
! 	return 1
  
      def visitLambda(self, node):
--- 863,867 ----
      def visitFunction(self, node):
          self.names.add(node.name)
!         return 1
  
      def visitLambda(self, node):
***************
*** 870,886 ****
  
      def visitImport(self, node):
! 	for name in node.names:
! 	    self.names.add(name)
  
      def visitFrom(self, node):
! 	for name in node.names:
! 	    self.names.add(name)
  
      def visitClassdef(self, node):
! 	self.names.add(node.name)
! 	return 1
  
      def visitAssName(self, node):
! 	self.names.add(node.name)
  
  class Loop:
--- 869,885 ----
  
      def visitImport(self, node):
!         for name in node.names:
!             self.names.add(name)
  
      def visitFrom(self, node):
!         for name in node.names:
!             self.names.add(name)
  
      def visitClassdef(self, node):
!         self.names.add(node.name)
!         return 1
  
      def visitAssName(self, node):
!         self.names.add(node.name)
  
  class Loop:
***************
*** 927,931 ****
          mtime = struct.pack('i', mtime)
          return magic + mtime
! 	
  if __name__ == "__main__":
      import getopt
--- 926,936 ----
          mtime = struct.pack('i', mtime)
          return magic + mtime
! 
! def compile(filename):
!     buf = open(filename).read()
!     mod = CompiledModule(buf, filename)
!     mod.compile()
!     mod.dump(filename + 'c')
!         
  if __name__ == "__main__":
      import getopt
***************
*** 946,951 ****
              if VERBOSE:
                  print filename
!             buf = open(filename).read()
!             mod = CompiledModule(buf, filename)
!             mod.compile()
!             mod.dump(filename + 'c')
--- 951,953 ----
              if VERBOSE:
                  print filename
!             compile(filename)



From fdrake@weyr.cnri.reston.va.us  Thu Feb 17 18:02:42 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Thu, 17 Feb 2000 13:02:42 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tut tut.tex,1.100.2.2,1.100.2.3
Message-ID: <200002171802.NAA00115@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tut
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tut

Modified Files:
      Tag: release152p1-patches
	tut.tex 
Log Message:

Patch from Skip Montanaro <skip@mojam.com>, with *really* minor markup 
nits fixed:

The diff below has one significant change (the English description of the
comparison operators).  The first and last changes are quite trivial.  The
third change isn't truly earth-shaking, but may serve somewhat to appease C
programmers investigating Python for the first time.


Index: tut.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tut/tut.tex,v
retrieving revision 1.100.2.2
retrieving revision 1.100.2.3
diff -C2 -r1.100.2.2 -r1.100.2.3
*** tut.tex	1999/12/03 22:00:31	1.100.2.2
--- tut.tex	2000/02/17 18:02:39	1.100.2.3
***************
*** 113,118 ****
  
  Python allows writing very compact and readable programs.  Programs
! written in Python are typically much shorter than equivalent C
! programs, for several reasons:
  \begin{itemize}
  \item
--- 113,118 ----
  
  Python allows writing very compact and readable programs.  Programs
! written in Python are typically much shorter than equivalent C or
! \Cpp{} programs, for several reasons:
  \begin{itemize}
  \item
***************
*** 854,859 ****
  length is true, empty sequences are false.  The test used in the
  example is a simple comparison.  The standard comparison operators are
! written the same as in C: \code{<}, \code{>}, \code{==}, \code{<=},
! \code{>=} and \code{!=}.
  
  \item
--- 854,860 ----
  length is true, empty sequences are false.  The test used in the
  example is a simple comparison.  The standard comparison operators are
! written the same as in C: \code{<} (less than), \code{>} (greater than),
! \code{==} (equal to), \code{<=} (less than or equal to),
! \code{>=} (greater than or equal to) and \code{!=} (not equal to).
  
  \item
***************
*** 1780,1783 ****
--- 1781,1787 ----
  
  Note that in Python, unlike C, assignment cannot occur inside expressions.
+ C programmers may grumble about this, but it avoids a common class of
+ problems encountered in C programs: typing \code{=} in an expression when
+ \code{==} was intended.
  
  \section{Comparing Sequences and Other Types \label{comparing}}
***************
*** 3461,3465 ****
  defined in the same base class, may in fact end up calling a method of
  a derived class that overrides it.  (For \Cpp{} programmers: all methods
! in Python are ``virtual functions''.)
  
  An overriding method in a derived class may in fact want to extend
--- 3465,3469 ----
  defined in the same base class, may in fact end up calling a method of
  a derived class that overrides it.  (For \Cpp{} programmers: all methods
! in Python are effectively \keyword{virtual}.)
  
  An overriding method in a derived class may in fact want to extend



From jhylton@cnri.reston.va.us  Thu Feb 17 22:06:23 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Thu, 17 Feb 2000 17:06:23 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/p2c ast.py,1.6,1.7
Message-ID: <200002172206.RAA23464@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/p2c
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/p2c

Modified Files:
	ast.py 
Log Message:
add varargs and kwargs flags to Lambda nodes


Index: ast.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/p2c/ast.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** ast.py	2000/02/15 21:30:00	1.6
--- ast.py	2000/02/17 22:06:20	1.7
***************
*** 106,109 ****
--- 106,114 ----
      self.code = code
      self._children = ('lambda', argnames, defaults, flags, code)
+     self.varargs = self.kwargs = None
+     if flags & CO_VARARGS:
+       self.varargs = 1
+     if flags & CO_VARKEYWORDS:
+       self.kwargs = 1
  
    def __repr__(self):



From jhylton@cnri.reston.va.us  Thu Feb 17 22:09:38 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Thu, 17 Feb 2000 17:09:38 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler compile.py,1.16,1.17 pyassem.py,1.3,1.4
Message-ID: <200002172209.RAA23491@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	compile.py pyassem.py 
Log Message:
the previous quick hack to fix def foo((x,y)) failed on some cases
(big surprise).  new solution is a little less hackish.

Code gen adds a TupleArg instance in the argument slot. The tuple arg
includes a copy of the names that it is responsble for binding.  The
PyAssembler uses this information to calculate the correct argcount.

all fix this wacky case: del (a, ((b,), c)), d
which is the same as: del a, b, c, d
(Can't wait for Guido to tell me why.)

solution uses findOp which walks a tree to find out whether it
contains OP_ASSIGN or OP_DELETE or ...



Index: compile.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/compile.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** compile.py	2000/02/17 17:56:29	1.16
--- compile.py	2000/02/17 22:09:35	1.17
***************
*** 7,11 ****
  
  from p2c import transformer, ast
! from pyassem import StackRef, PyAssembler
  import dis
  import misc
--- 7,11 ----
  
  from p2c import transformer, ast
! from pyassem import StackRef, PyAssembler, TupleArg
  import dis
  import misc
***************
*** 204,208 ****
                  args.append(elt)
              elif type(elt) == types.TupleType:
!                 args.append(".nested%d" % count)
                  count = count + 1
                  extra.extend(misc.flatten(elt))
--- 204,208 ----
                  args.append(elt)
              elif type(elt) == types.TupleType:
!                 args.append(TupleArg(count, elt))
                  count = count + 1
                  extra.extend(misc.flatten(elt))
***************
*** 344,348 ****
      def visitLambda(self, node):
          node.name = '<lambda>'
-         node.varargs = node.kwargs = None
          self._visitFuncOrLambda(node, 'Lambda')
          return 1
--- 344,347 ----
***************
*** 634,641 ****
  
      def visitAssName(self, node):
!         # XXX handle OP_DELETE
!         if node.flags != 'OP_ASSIGN':
              print "oops", node.flags
!         self.storeName(node.name)
  
      def visitAssAttr(self, node):
--- 633,643 ----
  
      def visitAssName(self, node):
!         if node.flags == 'OP_ASSIGN':
!             self.storeName(node.name)
!         elif node.flags == 'OP_DELETE':
!             self.delName(node.name)
!         else:
              print "oops", node.flags
!         return 1
  
      def visitAssAttr(self, node):
***************
*** 651,655 ****
  
      def visitAssTuple(self, node):
!         self.emit('UNPACK_TUPLE', len(node.nodes))
          for child in node.nodes:
              self.visit(child)
--- 653,658 ----
  
      def visitAssTuple(self, node):
!         if findOp(node) != 'OP_DELETE':
!             self.emit('UNPACK_TUPLE', len(node.nodes))
          for child in node.nodes:
              self.visit(child)
***************
*** 839,842 ****
--- 842,846 ----
              self.visit(node.globals)
          self.emit('EXEC_STMT')
+         return 1
  
  class LocalNameFinder:
***************
*** 882,885 ****
--- 886,903 ----
      def visitAssName(self, node):
          self.names.add(node.name)
+ 
+ class OpFinder:
+     def __init__(self):
+         self.op = None
+     def visitAssName(self, node):
+         if self.op is None:
+             self.op = node.flags
+         elif self.op != node.flags:
+             raise ValueError, "mixed ops in stmt"
+ 
+ def findOp(node):
+     v = OpFinder()
+     walk(node, v)
+     return v.op
  
  class Loop:

Index: pyassem.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/pyassem.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** pyassem.py	2000/02/16 00:50:29	1.3
--- pyassem.py	2000/02/17 22:09:35	1.4
***************
*** 43,46 ****
--- 43,55 ----
  CO_VARKEYWORDS = 0x0008
  
+ class TupleArg:
+     def __init__(self, count, names):
+         self.count = count
+         self.names = names
+     def __repr__(self):
+         return "TupleArg(%s, %s)" % (self.count, self.names)
+     def getName(self):
+         return ".nested%d" % self.count
+ 
  class PyAssembler:
      """Creates Python code objects
***************
*** 55,58 ****
--- 64,68 ----
          # used by makeCodeObject
          self._getArgCount(args)
+         print name, args, self.argcount
          self.code = ''
          self.consts = [docstring]
***************
*** 62,65 ****
--- 72,79 ----
          self.names = []
          self.varnames = list(args) or []
+         for i in range(len(self.varnames)):
+             var = self.varnames[i]
+             if isinstance(var, TupleArg):
+                 self.varnames[i] = var.getName()
          # lnotab support
          self.firstlineno = 0
***************
*** 69,80 ****
  
      def _getArgCount(self, args):
!         if args and args[0][0] == '.':
!             for i in range(len(args)):
!                 if args[i][0] == '.':
!                     num = i
!             self.argcount = num + 1
!         else:
!             self.argcount = len(args)
!                 
  
      def __repr__(self):
--- 83,92 ----
  
      def _getArgCount(self, args):
!         self.argcount = len(args)
!         if args:
!             for arg in args:
!                 if isinstance(arg, TupleArg):
!                     numNames = len(misc.flatten(arg.names))
!                     self.argcount = self.argcount - numNames 
  
      def __repr__(self):
***************
*** 89,93 ****
  
      def setVarArgs(self):
!         self.flags = self.flags | CO_VARARGS
  
      def setKWArgs(self):
--- 101,107 ----
  
      def setVarArgs(self):
!         if not self.flags & CO_VARARGS:
!             self.flags = self.flags | CO_VARARGS
!             self.argcount = self.argcount - 1
  
      def setKWArgs(self):



From jhylton@cnri.reston.va.us  Thu Feb 17 22:11:42 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Thu, 17 Feb 2000 17:11:42 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_func.py,1.7,1.8
Message-ID: <200002172211.RAA23514@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_func.py 
Log Message:
test some more variants of func defs


Index: test_func.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_func.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** test_func.py	2000/02/16 00:52:04	1.7
--- test_func.py	2000/02/17 22:11:39	1.8
***************
*** 10,21 ****
      return zfill(a, 10)
  
! def test4(((a, b), c), x, (d, (e, f))):
      return a + b * c - d / e + f
  
  def test():
      print test1(2)
      print test2('a', b='c', c='d', abc='42')
      print test3(None, Ellipsis, "365")
!     print test4(((10, 6), 2), 0, (6, (3, 22)))
  
  test()
--- 10,27 ----
      return zfill(a, 10)
  
! def test4(((a, b), c), x, (d, (e, f)), y, z):
      return a + b * c - d / e + f
  
+ def test5(a=1, *rest):
+     print rest
+     return map(lambda x, a=a: x + a, rest)
+ 
  def test():
      print test1(2)
      print test2('a', b='c', c='d', abc='42')
      print test3(None, Ellipsis, "365")
!     print test4(((10, 6), 2), 0, (6, (3, 22)), 0, 0)
!     print test5()
!     print test5(2, 0, 1, 2)
  
  test()



From jhylton@cnri.reston.va.us  Thu Feb 17 22:11:56 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Thu, 17 Feb 2000 17:11:56 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler/tests test_misc.py,1.2,1.3
Message-ID: <200002172211.RAA23531@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler/tests
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler/tests

Modified Files:
	test_misc.py 
Log Message:
test the del nonsense



Index: test_misc.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/tests/test_misc.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** test_misc.py	2000/02/15 21:46:33	1.2
--- test_misc.py	2000/02/17 22:11:53	1.3
***************
*** 11,12 ****
--- 11,13 ----
      print "ya"
  
+ del (((a,), d,),)



From jhylton@cnri.reston.va.us  Thu Feb 17 22:58:56 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Thu, 17 Feb 2000 17:58:56 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler pyassem.py,1.4,1.5
Message-ID: <200002172258.RAA23745@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	pyassem.py 
Log Message:
changes to _lookupName
- removed now (happily) unused second arg
- need to verify results of [].index are correct; for building consts,
  need to have same value and same type, e.g. 2 not the same as 2L




Index: pyassem.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/pyassem.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** pyassem.py	2000/02/17 22:09:35	1.4
--- pyassem.py	2000/02/17 22:58:54	1.5
***************
*** 64,68 ****
          # used by makeCodeObject
          self._getArgCount(args)
-         print name, args, self.argcount
          self.code = ''
          self.consts = [docstring]
--- 64,67 ----
***************
*** 261,278 ****
      globalOps = ('LOAD_GLOBAL', 'STORE_GLOBAL', 'DELETE_GLOBAL')
  
!     def _lookupName(self, name, list, list2=None):
!         """Return index of name in list, appending if necessary
! 
!         Yicky hack: Second list can be used for lookup of local names
!         where the name needs to be added to varnames and names.
!         """
          if name in list:
!             return list.index(name)
!         else:
!             end = len(list)
!             list.append(name)
!             if list2 is not None:
!                 list2.append(name)
!             return end
  
      # Convert some stuff from the dis module for local use
--- 260,277 ----
      globalOps = ('LOAD_GLOBAL', 'STORE_GLOBAL', 'DELETE_GLOBAL')
  
!     def _lookupName(self, name, list):
!         """Return index of name in list, appending if necessary"""
          if name in list:
!             i = list.index(name)
!             # this is cheap, but incorrect in some cases, e.g 2 vs. 2L
!             if type(name) == type(list[i]):
!                 return i
!             for i in range(len(list)):
!                 elt = list[i]
!                 if type(elt) == type(name) and elt == name:
!                     return i
!         end = len(list)
!         list.append(name)
!         return end
  
      # Convert some stuff from the dis module for local use



From fdrake@weyr.cnri.reston.va.us  Fri Feb 18 18:24:22 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 18 Feb 2000 13:24:22 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib liburllib.tex,1.20.4.1,1.20.4.2
Message-ID: <200002181824.NAA02625@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	liburllib.tex 
Log Message:

Patch from Skip Montanaro <skip@mojam.com>:

The appended patch updates liburllib.tex by

    * documenting use of HTTP proxies (I thought I sent this once before,
      but CVS still shows it missing)

    * providing an example of common usage (again, I thought I had sent this 
      before)

    * documenting the URLopener and FancyURLopener classes

    * describing how users of the urlopen and urlretrieve can override their
      default behavior by assigning a URLopener subclass to
      urllib._urlopener.

(Minor markup revisions by FLD; mostly consistency issues.)


Index: liburllib.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/liburllib.tex,v
retrieving revision 1.20.4.1
retrieving revision 1.20.4.2
diff -C2 -r1.20.4.1 -r1.20.4.2
*** liburllib.tex	2000/01/10 20:00:57	1.20.4.1
--- liburllib.tex	2000/02/18 18:24:19	1.20.4.2
***************
*** 1,7 ****
  \section{\module{urllib} ---
!          Open an arbitrary object given by URL.}
! \declaremodule{standard}{urllib}
  
! \modulesynopsis{Open an arbitrary object given by URL (requires sockets).}
  
  \index{WWW}
--- 1,7 ----
  \section{\module{urllib} ---
!          Open an arbitrary resource by URL}
  
! \declaremodule{standard}{urllib}
! \modulesynopsis{Open an arbitrary network resource by URL (requires sockets).}
  
  \index{WWW}
***************
*** 79,82 ****
--- 79,97 ----
  information from Internet\index{Internet Config} Config.
  
+ The \function{urlopen()} function works transparently with proxies.
+ In a \UNIX{} or Windows environment, set the \envvar{http_proxy},
+ \envvar{ftp_proxy} or \envvar{gopher_proxy} environment variables to a
+ URL that identifies the proxy server before starting the Python
+ interpreter, e.g.:
+ 
+ \begin{verbatim}
+ % http_proxy="http://www.someproxy.com:3128"
+ % export http_proxy
+ % python
+ ...
+ \end{verbatim}
+ 
+ In a Macintosh environment, \function{urlopen()} will retrieve proxy
+ information from Internet Config.
  \end{funcdesc}
  
***************
*** 143,146 ****
--- 158,234 ----
  \function{quote_plus()} above.
  \end{funcdesc}
+ 
+ The public functions \function{urlopen()} and \function{urlretrieve()}
+ create an instance of the \class{FancyURLopener} class and use it to perform
+ their requested actions.  To override this functionality, programmers can
+ create a subclass of \class{URLopener} or \class{FancyURLopener}, then
+ assign that class to the \var{urllib._urlopener} variable before calling the
+ desired function.  For example, applications may want to specify a different
+ \code{user-agent} header than \class{URLopener} defines.  This can be
+ accomplished with the following code:
+ 
+ \begin{verbatim}
+ class AppURLopener(urllib.FancyURLopener):
+     def __init__(self, *args):
+         apply(urllib.FancyURLopener.__init__, (self,) + args)
+         self.version = "App/1.7"
+ 
+ urllib._urlopener = AppURLopener
+ \end{verbatim}
+ 
+ \begin{classdesc}{URLopener}{\optional{proxies\optional{, **x509}}}
+ Base class for opening and reading URLs.  Unless you need to support
+ opening objects using schemes other than \file{http:}, \file{ftp:},
+ \file{gopher:} or \file{file:}, you probably want to use
+ \class{FancyURLopener}.
+ 
+ By default, the \class{URLopener} class sends a
+ \code{user-agent} header of \samp{urllib/\var{VVV}}, where
+ \var{VVV} is the \module{urllib} version number.  Applications can
+ define their own \code{user-agent} header by subclassing
+ \class{URLopener} or \class{FancyURLopener} and setting the instance
+ attribute \var{version} to an appropriate string value before the
+ \method{open()} method is called.
+ 
+ Additional keyword parameters, collected in \var{x509}, are used for
+ authentication with the \file{https:} scheme.  The keywords
+ \var{key_file} and \var{cert_file} are supported.
+ 
+ \begin{methoddesc}{open}{fullurl\optional{, data}}
+ Open \var{fullurl} using the appropriate protocol.  This method sets 
+ up cache and proxy information, then calls the appropriate open method with
+ its input arguments.  If the scheme is not recognized,
+ \method{open_unknown()} is called.  The \var{data} argument 
+ has the same meaning as the \var{data} argument of \function{urlopen()}.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{open_unknown}{fullurl\optional{, data}}
+ Overridable interface to open unknown URL types.
+ \end{methoddesc}
+ 
+ \begin{methoddesc}{retrieve}{url\optional{, filename\optional{, reporthook}}}
+ Retrieves the contents of \var{url} and places it in \var{filename}.  The
+ return value is a tuple consisting of a local filename and either a
+ \class{mimetools.Message} object containing the response headers (for remote
+ URLs) or None (for local URLs).  The caller must then open and read the
+ contents of \var{filename}.  If \var{filename} is not given and the URL
+ refers to a local file, the input filename is returned.  If the URL is
+ non-local and \var{filename} is not given, the filename is the output of
+ \function{tempfile.mktemp()} with a suffix that matches the suffix of the last
+ path component of the input URL.  If \var{reporthook} is given, it must be
+ a function accepting three numeric parameters.  It will be called after each
+ chunk of data is read from the network.  \var{reporthook} is ignored for
+ local URLs.
+ \end{methoddesc}
+ 
+ \end{classdesc}
+ 
+ \begin{classdesc}{FancyURLopener}
+ \class{FancyURLopener} subclasses \class{URLopener} providing default handling 
+ for the following HTTP response codes: 301, 302 or 401.  For 301 and 302
+ response codes, the \code{location} header is used to fetch the actual URL.
+ For 401 response codes (authentication required), basic HTTP authentication
+ is performed.
+ \end{classdesc}
  
  Restrictions:



From akuchlin@CNRI.Reston.VA.US  Fri Feb 18 18:30:04 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Fri, 18 Feb 2000 13:30:04 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules pcremodule.c,2.15,2.16
Message-ID: <200002181830.NAA04982@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory amarok:/home/akuchlin/src/Python-1.5/Modules

Modified Files:
	pcremodule.c 
Log Message:
Patch from Vladimir Marangozov <marangoz@python.inrialpes.fr>:
	The buffers self->regex and self->regex_extra are allocated in
	pcre_compile() and pcre_study() via pcre_malloc, but are released
	via free() instead of pcre_free.


Index: pcremodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/pcremodule.c,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** pcremodule.c	2000/02/04 20:33:27	2.15
--- pcremodule.c	2000/02/18 18:30:01	2.16
***************
*** 94,101 ****
  	PcreObject *self;
  {
! 	if (self->regex) free(self->regex);
! 	if (self->regex_extra) free(self->regex_extra);
! 	self->regex=NULL;
! 	self->regex_extra=NULL;
  	PyMem_DEL(self);
  }
--- 94,99 ----
  	PcreObject *self;
  {
! 	if (self->regex) (pcre_free)(self->regex);
! 	if (self->regex_extra) (pcre_free)(self->regex_extra);
  	PyMem_DEL(self);
  }



From akuchlin@CNRI.Reston.VA.US  Fri Feb 18 19:16:49 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Fri, 18 Feb 2000 14:16:49 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules pypcre.c,2.16,2.17
Message-ID: <200002181916.OAA05294@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory amarok:/home/akuchlin/src/Python-1.5/Modules

Modified Files:
	pypcre.c 
Log Message:
Patch from Vladimir Marangozov <marangoz@python.inrialpes.fr>
	The same problem (mixed mallocs) exists for the pcre stack.
	The buffers md->... are allocated via PyMem_RESIZE in grow_stack(),
	while in free_stack() they are released with free() instead of 
	PyMem_DEL().


Index: pypcre.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/pypcre.c,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -r2.16 -r2.17
*** pypcre.c	1999/01/27 21:41:08	2.16
--- pypcre.c	2000/02/18 19:16:45	2.17
***************
*** 3058,3067 ****
  {
  /* Free any stack space that was allocated by the call to match(). */
! if (md->off_num)    free(md->off_num); 
! if (md->offset_top) free(md->offset_top); 
! if (md->r1)         free(md->r1); 
! if (md->r2)         free(md->r2); 
! if (md->eptr)       free((char *)md->eptr); 
! if (md->ecode)      free((char *)md->ecode);
  return 0;
  }
--- 3058,3067 ----
  {
  /* Free any stack space that was allocated by the call to match(). */
! if (md->off_num)    PyMem_DEL(md->off_num); 
! if (md->offset_top) PyMem_DEL(md->offset_top); 
! if (md->r1)         PyMem_DEL(md->r1); 
! if (md->r2)         PyMem_DEL(md->r2); 
! if (md->eptr)       PyMem_DEL((char *)md->eptr); 
! if (md->ecode)      PyMem_DEL((char *)md->ecode);
  return 0;
  }



From fdrake@weyr.cnri.reston.va.us  Fri Feb 18 23:17:56 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 18 Feb 2000 18:17:56 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib liburllib.tex,1.20.4.2,1.20.4.3
Message-ID: <200002182317.SAA04462@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	liburllib.tex 
Log Message:

Clarified the use of keyword parameters for https authentication;
approved by Skip.


Index: liburllib.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/liburllib.tex,v
retrieving revision 1.20.4.2
retrieving revision 1.20.4.3
diff -C2 -r1.20.4.2 -r1.20.4.3
*** liburllib.tex	2000/02/18 18:24:19	1.20.4.2
--- liburllib.tex	2000/02/18 23:17:53	1.20.4.3
***************
*** 193,197 ****
  Additional keyword parameters, collected in \var{x509}, are used for
  authentication with the \file{https:} scheme.  The keywords
! \var{key_file} and \var{cert_file} are supported.
  
  \begin{methoddesc}{open}{fullurl\optional{, data}}
--- 193,198 ----
  Additional keyword parameters, collected in \var{x509}, are used for
  authentication with the \file{https:} scheme.  The keywords
! \var{key_file} and \var{cert_file} are supported; both are needed to
! actually retrieve a resource at an \file{https:} URL.
  
  \begin{methoddesc}{open}{fullurl\optional{, data}}



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 15:29:58 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 10:29:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/doc doc.tex,1.12.2.1,1.12.2.2
Message-ID: <200002211529.KAA06567@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1/doc

Modified Files:
      Tag: release152p1-patches
	doc.tex 
Log Message:

Fixed a couple of typos reported by Greg Ward <gward@python.net>.


Index: doc.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/doc/doc.tex,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -C2 -r1.12.2.1 -r1.12.2.2
*** doc.tex	2000/01/28 21:17:09	1.12.2.1
--- doc.tex	2000/02/21 15:29:55	1.12.2.2
***************
*** 714,718 ****
  
      Effective index generation for technical documents can be very
!     difficult, especially for someone familliar with the topic but not
      the creation of indexes.  Much of the difficulty arises in the
      area of terminology: including the terms an expert would use for a
--- 714,718 ----
  
      Effective index generation for technical documents can be very
!     difficult, especially for someone familiar with the topic but not
      the creation of indexes.  Much of the difficulty arises in the
      area of terminology: including the terms an expert would use for a
***************
*** 723,727 ****
      The truly difficult aspects of index generation are not areas with
      which the documentation tools can help.  However, ease
!     of producing the index once content decisions are make is within
      the scope of the tools.  Markup is provided which the processing
      software is able to use to generate a variety of kinds of index
--- 723,727 ----
      The truly difficult aspects of index generation are not areas with
      which the documentation tools can help.  However, ease
!     of producing the index once content decisions are made is within
      the scope of the tools.  Markup is provided which the processing
      software is able to use to generate a variety of kinds of index



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 16:12:04 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 11:12:04 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc TODO,1.24,1.24.2.1
Message-ID: <200002211612.LAA06769@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	TODO 
Log Message:

Substantially revise; this pertains specifically to the 1.5.2p2
release.

Now organized by manual.


Index: TODO
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/TODO,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -r1.24 -r1.24.2.1
*** TODO	1999/08/19 15:37:35	1.24
--- TODO	2000/02/21 16:12:01	1.24.2.1
***************
*** 2,10 ****
--- 2,45 ----
  ===============================
  
+ -------------------------------------------------------------
+ This list pertains only to the 1.5.2p2 documentation release.
+ -------------------------------------------------------------
  
+ 
+ Python/C API
+ ------------
+ 
  * The "Very High Level Interface" in the API document has been
    requested; I guess it wouldn't hurt to fill in a bit there.  Request 
    by Albert Hofkamp <a.hofkamp@wtb.tue.nl>.  (Partly done.)
  
+ * Python/C API reference is missing PyArg_ParseTuple(),
+   PyArg_ParseTupleAndKeywords(), Py_BuildValue().  Information
+   requested by Greg Kochanski <gpk@bell-labs.com>.
+ 
+ * PyEval_EvalCode() must also be documented.  Ask Guido about source
+   comment: "Backward compatible interface".
+ 
+ * Break up the PyBufferProcs description so that the function types
+   are independently described.  Perhaps break the chapter into
+   sections for each of the *Procs interfaces.
+ 
+ * Make sure the reference count behavior of all the "exceptional"
+   cases in the C API is documented in the API manual, and mentioned in 
+   the extension manual if the function is mentioned.
+ 
+ * Ask Vladimir Marangozov <marangoz@python.inrialpes.fr> to document
+   the memory allocation APIs; this could be part of his proposed
+   cleanup.  ;)
+ 
+ * PyErr_SetInterrupt():  XXX comment about platform dependence should
+   be resolved, or explain the problem.  Ask Guido for explanation.
+ 
+ * PySys_SetArgv() impl. doesn't seem consistent in allowing 0/NULL for
+   the params; check w/ Guido.
+ 
+ Extending & Embedding
+ ---------------------
+ 
  * Describe implementing types in C, including use of the 'self'
    parameter to the method implementation function.  (Missing material
***************
*** 18,25 ****
  
  * Update the pickle documentation to describe all of the current
!   behavior; only a subset is described.  __reduce__, etc.
  
- * Update the code/codeop module documentation.
- 
  * In the indexes, some subitem entries are separated from the item
    entries by column- or page-breaks.  Reported by Lorenzo M. Catucci
--- 53,59 ----
  
  * Update the pickle documentation to describe all of the current
!   behavior; only a subset is described.  __reduce__, etc.  Partial
!   update submitted by Jim Kerr <jbkerr@sr.hp.com>.
  
  * In the indexes, some subitem entries are separated from the item
    entries by column- or page-breaks.  Reported by Lorenzo M. Catucci
***************
*** 29,48 ****
    change the index entries in the text.)
  
- * Fix problem with howto documents getting the last module synopsis
-   twice (in \localmoduletable) so we can get rid of the ugly 'uniq'
-   hack in tools/mkhowto.sh.  (Probably not worth the trouble of
-   fixing.)
- 
- * Figure out HTMLHelp generation for the Windows world.
- 
- * Straighten out random/whrandom.
- 
- 
- BEFORE NEXT PYTHON RELEASE, BUT NOT UNTIL THEN:
  
! * Document that the mode parameter to wave.open() may be omitted, and
!   how it is determined if omitted.  (Same of aifc, sunau open()
!   functions.)
  
! * Document that fpformat.NotANumber is a subclass of ValueError, has
!   the string that failed as the "exception value".
--- 63,71 ----
    change the index entries in the text.)
  
  
! Library Reference
! -----------------
  
! * Straighten out random/whrandom.  Things are generally in the right
!   place, but need to respond to comments in email from Jan Kim
!   <kim@mpiz-koeln.mpg.de>.



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 16:12:36 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 11:12:36 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api refcounts.dat,1.2,1.2.2.1
Message-ID: <200002211612.LAA06792@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p1/api

Modified Files:
      Tag: release152p1-patches
	refcounts.dat 
Log Message:

A couple of fixes.


Index: refcounts.dat
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/refcounts.dat,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** refcounts.dat	1999/10/20 16:03:38	1.2
--- refcounts.dat	2000/02/21 16:12:33	1.2.2.1
***************
*** 257,264 ****
  PyImport_ImportFrozenModule:char*:::
  
! PyImport_ImportModule:PyObject*::1:not sure...
  PyImport_ImportModule:char*:name::
  
! PyImport_ImportModuleEx:PyObject*::0:???
  PyImport_ImportModuleEx:char*:name::
  PyImport_ImportModuleEx:PyObject*:globals:0:???
--- 257,264 ----
  PyImport_ImportFrozenModule:char*:::
  
! PyImport_ImportModule:PyObject*::+1:
  PyImport_ImportModule:char*:name::
  
! PyImport_ImportModuleEx:PyObject*::+1:
  PyImport_ImportModuleEx:char*:name::
  PyImport_ImportModuleEx:PyObject*:globals:0:???
***************
*** 266,270 ****
  PyImport_ImportModuleEx:PyObject*:fromlist:0:???
  
! PyImport_ReloadModule:PyObject*::0:
  PyImport_ReloadModule:PyObject*:m:0:
  
--- 266,270 ----
  PyImport_ImportModuleEx:PyObject*:fromlist:0:???
  
! PyImport_ReloadModule:PyObject*::+1:
  PyImport_ReloadModule:PyObject*:m:0:
  



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 16:19:46 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 11:19:46 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib internet.tex,1.2,1.2.4.1 libsocket.tex,1.39.2.2,1.39.2.3
Message-ID: <200002211619.LAA06831@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	internet.tex libsocket.tex 
Log Message:

Update the platform dependence notes regarding the socket module; this is
supported on more platforms than Unix!  Based on comments from 
Jack Jansen <jack@oratrix.nl>.


Index: internet.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/internet.tex,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -r1.2 -r1.2.4.1
*** internet.tex	1999/04/22 16:03:30	1.2
--- internet.tex	2000/02/21 16:19:43	1.2.4.1
***************
*** 7,13 ****
  The modules described in this chapter implement Internet protocols and 
  support for related technology.  They are all implemented in Python.
! Some of these modules require the presence of the system-dependent
! module \refmodule{socket}\refbimodindex{socket}, which is currently only
! fully supported on \UNIX{} and Windows NT.  Here is an overview:
  
  \localmoduletable
--- 7,13 ----
  The modules described in this chapter implement Internet protocols and 
  support for related technology.  They are all implemented in Python.
! Most of these modules require the presence of the system-dependent
! module \refmodule{socket}\refbimodindex{socket}, which is currently
! supported on most popular platforms.  Here is an overview:
  
  \localmoduletable

Index: libsocket.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libsocket.tex,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -C2 -r1.39.2.2 -r1.39.2.3
*** libsocket.tex	1999/09/16 15:52:19	1.39.2.2
--- libsocket.tex	2000/02/21 16:19:43	1.39.2.3
***************
*** 7,11 ****
  
  This module provides access to the BSD \emph{socket} interface.
! It is available on \UNIX{} systems that support this interface.
  
  For an introduction to socket programming (in C), see the following
--- 7,12 ----
  
  This module provides access to the BSD \emph{socket} interface.
! It is available on all modern \UNIX{} systems, Windows, MacOS, BeOS,
! OS/2, and probably additional platforms.
  
  For an introduction to socket programming (in C), see the following
***************
*** 14,20 ****
  Communication Tutorial}, by Samuel J.  Leffler et al, both in the
  \UNIX{} Programmer's Manual, Supplementary Documents 1 (sections PS1:7
! and PS1:8).  The \UNIX{} manual pages for the various socket-related
! system calls are also a valuable source of information on the details of
! socket semantics.
  
  The Python interface is a straightforward transliteration of the
--- 15,22 ----
  Communication Tutorial}, by Samuel J.  Leffler et al, both in the
  \UNIX{} Programmer's Manual, Supplementary Documents 1 (sections PS1:7
! and PS1:8).  The platform-specific reference material for the various
! socket-related system calls are also a valuable source of information
! on the details of socket semantics.  For \UNIX, refer to the manual
! pages; for Windows, see the WinSock (or Winsock 2) specification.
  
  The Python interface is a straightforward transliteration of the



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 16:21:24 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 11:21:24 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libundoc.tex,1.67.2.2,1.67.2.3
Message-ID: <200002211621.LAA06859@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libundoc.tex 
Log Message:

Add a note that the dircmp module will be obsolete in 1.6.


Index: libundoc.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libundoc.tex,v
retrieving revision 1.67.2.2
retrieving revision 1.67.2.3
diff -C2 -r1.67.2.2 -r1.67.2.3
*** libundoc.tex	1999/12/01 18:41:59	1.67.2.2
--- libundoc.tex	2000/02/21 16:21:21	1.67.2.3
***************
*** 39,43 ****
  \begin{description}
  \item[\module{dircmp}]
! --- class to build directory diff tools on (may become a demo or tool)
  
  \item[\module{bdb}]
--- 39,44 ----
  \begin{description}
  \item[\module{dircmp}]
! --- Class to build directory diff tools on (may become a demo or tool).
! \deprecated{1.6}{The \module{filecmp} module will replace \module{dircmp}.}
  
  \item[\module{bdb}]
***************
*** 78,82 ****
  
  \item[\module{sunaudio}]
! --- interpret sun audio headers (may become obsolete or a tool/demo)
  
  \item[\module{toaiff}]
--- 79,83 ----
  
  \item[\module{sunaudio}]
! --- Interpret Sun audio headers (may become obsolete or a tool/demo)
  
  \item[\module{toaiff}]



From guido@cnri.reston.va.us  Mon Feb 21 16:50:33 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 21 Feb 2000 11:50:33 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python errors.c,2.42,2.43
Message-ID: <200002211650.LAA02372@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory eric:/projects/python/develop/guido/src/Python

Modified Files:
	errors.c 
Log Message:
Mark pointed out a buglet in his patch: i < _sys_nerr isn't strong
enough, it could be negative.  Add i > 0 test.  (Not i >= 0; zero isn't
a valid error number.)


Index: errors.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/errors.c,v
retrieving revision 2.42
retrieving revision 2.43
diff -C2 -r2.42 -r2.43
*** errors.c	2000/02/17 15:19:15	2.42
--- errors.c	2000/02/21 16:50:31	2.43
***************
*** 309,313 ****
  		   a Win32 error code
  		*/
! 		if (i < _sys_nerr) {
  			s = _sys_errlist[i];
  		}
--- 309,313 ----
  		   a Win32 error code
  		*/
! 		if (i > 0 && i < _sys_nerr) {
  			s = _sys_errlist[i];
  		}



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 16:52:27 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 11:52:27 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.9,1.56.2.10
Message-ID: <200002211652.LAA07038@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p1/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Lots of minor markup adjustments to keep things clean.  Sought &
adjusted markup that can make LaTeX2HTML drop a space in the output.

Added explanation of where to find the installed header files for Unix 
& Windows.

Added a paragraph at the top of the high-level functions section
explaining the 'start' parameter, telling what the useful values are
and pointing to the specific explanations of each at the end of the
section.

Added a short section to the "Exception Handling" chapter describing
the deprecation of string exceptions and removal of the -X option in
future releases of the interpreter.

Filled in a few missing descriptions throughout the document, and
filled out a bunch more that were incomplete; many descriptions now
sport slick new exception information.

Re-structured the descripition of the API for complex numbers, clearly 
separating the C-type from the Python-type portions.

Commented out the "Debugging" chapter since it hasn't been written.


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.9
retrieving revision 1.56.2.10
diff -C2 -r1.56.2.9 -r1.56.2.10
*** api.tex	2000/02/16 16:07:43	1.56.2.9
--- api.tex	2000/02/21 16:52:23	1.56.2.10
***************
*** 21,25 ****
  
  \noindent
! This manual documents the API used by \C{} (or \Cpp{}) programmers who
  want to write extension modules or embed Python.  It is a companion to
  \emph{Extending and Embedding the Python Interpreter}, which describes
--- 21,25 ----
  
  \noindent
! This manual documents the API used by C (or \Cpp{}) programmers who
  want to write extension modules or embed Python.  It is a companion to
[...1602 lines suppressed...]
! XXX Explain Py_DEBUG, Py_TRACE_REFS, Py_REF_DEBUG.
  
  
--- 3377,3392 ----
  characters may be multi-byte characters. This implies that a buffer
  size of \var{N} does not mean there are \var{N} characters present.
  \end{ctypedesc}
  
  DL_IMPORT
  
  Py*_Check
  
+ _Py_NoneStruct
  
  
! % \chapter{Debugging \label{debugging}}
! %
! % XXX Explain Py_DEBUG, Py_TRACE_REFS, Py_REF_DEBUG.
  
  



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:05:12 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:05:12 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/perl python.perl,1.65.2.4,1.65.2.5
Message-ID: <200002211705.MAA07166@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/perl
In directory weyr:/home/fdrake/projects/python/Doc-152p1/perl

Modified Files:
      Tag: release152p1-patches
	python.perl 
Log Message:

Adjust result for \file to match what CSS-aware browsers do as much as 
possible for non-CSS browsers; this is so users get the same
presentation as much as possible.

make_mod_index_entry():  Fix broken generation of Module Index data.


Index: python.perl
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/perl/python.perl,v
retrieving revision 1.65.2.4
retrieving revision 1.65.2.5
diff -C2 -r1.65.2.4 -r1.65.2.5
*** python.perl	2000/02/16 17:13:58	1.65.2.4
--- python.perl	2000/02/21 17:05:09	1.65.2.5
***************
*** 160,166 ****
      return use_italics(@_); }
  sub do_cmd_file{
!     return use_wrappers(@_[0], '<tt class="file">', '</tt>'); }
  sub do_cmd_filenq{
!     return use_wrappers(@_[0], '<tt class="file">', '</tt>'); }
  sub do_cmd_samp{
      return use_wrappers(@_[0], '"<tt class="samp">', '</tt>"'); }
--- 160,168 ----
      return use_italics(@_); }
  sub do_cmd_file{
!     return use_wrappers(@_[0],
!                         '<font class="file" face="sans-serif">',
!                         '</font>'); }
  sub do_cmd_filenq{
!     return do_cmd_file(@_[0]); }
  sub do_cmd_samp{
      return use_wrappers(@_[0], '"<tt class="samp">', '</tt>"'); }
***************
*** 482,486 ****
      if ($define eq 'DEF') {
  	# add to the module index
! 	my($nstr,$garbage) = split / /, $str, 2;
  	$Modules{$nstr} .= $ahref;
      }
--- 484,489 ----
      if ($define eq 'DEF') {
  	# add to the module index
!         $str =~ /(<tt.*<\/tt>)/;
!         my $nstr = $1;
  	$Modules{$nstr} .= $ahref;
      }



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:20:19 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:20:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tools cklatex,NONE,1.1
Message-ID: <200002211720.MAA07254@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tools
In directory weyr:/home/fdrake/projects/python/Doc/tools

Added Files:
	cklatex 
Log Message:

Script to help locate markup that LaTeX2HTML has a problem with.





From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:21:21 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:21:21 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tut tut.tex,1.100.2.3,1.100.2.4
Message-ID: <200002211721.MAA07284@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tut
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tut

Modified Files:
      Tag: release152p1-patches
	tut.tex 
Log Message:

Sought & adjusted markup that can make LaTeX2HTML drop a space in the
output.


Index: tut.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tut/tut.tex,v
retrieving revision 1.100.2.3
retrieving revision 1.100.2.4
diff -C2 -r1.100.2.3 -r1.100.2.4
*** tut.tex	2000/02/17 18:02:39	1.100.2.3
--- tut.tex	2000/02/21 17:21:18	1.100.2.4
***************
*** 159,166 ****
  \section{Invoking the Interpreter \label{invoking}}
  
! The Python interpreter is usually installed as \file{/usr/local/bin/python}
! on those machines where it is available; putting \file{/usr/local/bin} in
! your \UNIX{} shell's search path makes it possible to start it by
! typing the command
  
  \begin{verbatim}
--- 159,166 ----
  \section{Invoking the Interpreter \label{invoking}}
  
! The Python interpreter is usually installed as
! \file{/usr/local/bin/python} on those machines where it is available;
! putting \file{/usr/local/bin} in your \UNIX{} shell's search path
! makes it possible to start it by typing the command
  
  \begin{verbatim}
***************
*** 309,314 ****
  can do this by setting an environment variable named
  \envvar{PYTHONSTARTUP} to the name of a file containing your start-up
! commands.  This is similar to the \file{.profile} feature of the \UNIX{}
! shells.
  
  This file is only read in interactive sessions, not when Python reads
--- 309,314 ----
  can do this by setting an environment variable named
  \envvar{PYTHONSTARTUP} to the name of a file containing your start-up
! commands.  This is similar to the \file{.profile} feature of the
! \UNIX{} shells.
  
  This file is only read in interactive sessions, not when Python reads
***************
*** 376,382 ****
  The interpreter acts as a simple calculator: you can type an
  expression at it and it will write the value.  Expression syntax is
! straightforward: the operators \code{+}, \code{-}, \code{*} and \code{/}
! work just like in most other languages (e.g., Pascal or C); parentheses
! can be used for grouping.  For example:
  
  \begin{verbatim}
--- 376,382 ----
  The interpreter acts as a simple calculator: you can type an
  expression at it and it will write the value.  Expression syntax is
! straightforward: the operators \code{+}, \code{-}, \code{*} and
! \code{/} work just like in most other languages (e.g., Pascal or C);
! parentheses can be used for grouping.  For example:
  
  \begin{verbatim}
***************
*** 634,639 ****
  \end{verbatim}
  
! Here's a useful invariant of slice operations: \code{s[:i] + s[i:]}
! equals \code{s}.
  
  \begin{verbatim}
--- 634,639 ----
  \end{verbatim}
  
! Here's a useful invariant of slice operations:
! \code{s[:i] + s[i:]} equals \code{s}.
  
  \begin{verbatim}
***************
*** 909,914 ****
  \section{\keyword{if} Statements \label{if}}
  
! Perhaps the most well-known statement type is the \keyword{if}
! statement.  For example:
  
  \begin{verbatim}
--- 909,914 ----
  \section{\keyword{if} Statements \label{if}}
  
! Perhaps the most well-known statement type is the
! \keyword{if} statement.  For example:
  
  \begin{verbatim}
***************
*** 926,937 ****
  \end{verbatim}
  
! There can be zero or more \keyword{elif} parts, and the \keyword{else}
! part is optional.  The keyword `\keyword{elif}' is short for `else
! if', and is useful to avoid excessive indentation.  An
! \keyword{if} \ldots\ \keyword{elif} \ldots\ \keyword{elif}
! \ldots\ sequence is a substitute for the  \emph{switch} or
! %    ^^^^
  %    Weird spacings happen here if the wrapping of the source text
  %    gets changed in the wrong way.
  \emph{case} statements found in other languages.
  
--- 926,936 ----
  \end{verbatim}
  
! There can be zero or more \keyword{elif} parts, and the
! \keyword{else} part is optional.  The keyword `\keyword{elif}' is
! short for `else if', and is useful to avoid excessive indentation.  An 
! \keyword{if} \ldots\ \keyword{elif} \ldots\ \keyword{elif} \ldots\ sequence
  %    Weird spacings happen here if the wrapping of the source text
  %    gets changed in the wrong way.
+ is a substitute for the  \emph{switch} or
  \emph{case} statements found in other languages.
  
***************
*** 943,950 ****
  iterating over an arithmetic progression of numbers (like in Pascal),
  or giving the user the ability to define both the iteration step and
! halting condition (as C), Python's \keyword{for}\stindex{for}
! statement iterates over the items of any sequence (e.g., a list or a
! string), in the order that they appear in the sequence.  For example
! (no pun intended):
  % One suggestion was to give a real C example here, but that may only
  % serve to confuse non-C programmers.
--- 942,949 ----
  iterating over an arithmetic progression of numbers (like in Pascal),
  or giving the user the ability to define both the iteration step and
! halting condition (as C), Python's
! \keyword{for}\stindex{for} statement iterates over the items of any
! sequence (e.g., a list or a string), in the order that they appear in
! the sequence.  For example (no pun intended):
  % One suggestion was to give a real C example here, but that may only
  % serve to confuse non-C programmers.
***************
*** 1002,1007 ****
  \end{verbatim}
  
! To iterate over the indices of a sequence, combine \function{range()}
! and \function{len()} as follows:
  
  \begin{verbatim}
--- 1001,1006 ----
  \end{verbatim}
  
! To iterate over the indices of a sequence, combine
! \function{range()} and \function{len()} as follows:
  
  \begin{verbatim}
***************
*** 1017,1020 ****
--- 1016,1020 ----
  \end{verbatim}
  
+ 
  \section{\keyword{break} and \keyword{continue} Statements, and
           \keyword{else} Clauses on Loops
***************
*** 1315,1323 ****
  present, it receives a dictionary containing all keyword arguments
  whose keyword doesn't correspond to a formal parameter.  This may be
! combined with a formal parameter of the form \code{*\var{name}}
! (described in the next subsection) which receives a tuple containing
! the positional arguments beyond the formal parameter list.
! (\code{*\var{name}} must occur before \code{**\var{name}}.)  For
! example, if we define a function like this:
  
  \begin{verbatim}
--- 1315,1323 ----
  present, it receives a dictionary containing all keyword arguments
  whose keyword doesn't correspond to a formal parameter.  This may be
! combined with a formal parameter of the form
! \code{*\var{name}} (described in the next subsection) which receives a
! tuple containing the positional arguments beyond the formal parameter
! list.  (\code{*\var{name}} must occur before \code{**\var{name}}.)
! For example, if we define a function like this:
  
  \begin{verbatim}
***************
*** 1389,1394 ****
  There are emerging conventions about the content and formatting of
  documentation strings.
! \index{docstrings}
! \index{documentation strings}
  \index{strings, documentation}
  
--- 1389,1393 ----
  There are emerging conventions about the content and formatting of
  documentation strings.
! \index{docstrings}\index{documentation strings}
  \index{strings, documentation}
  
***************
*** 1714,1722 ****
  value using a non-existent key.
  
! The \code{keys()} method of a dictionary object returns a list of all the
! keys used in the dictionary, in random order (if you want it sorted,
! just apply the \code{sort()} method to the list of keys).  To check
! whether a single key is in the dictionary, use the \code{has_key()}
! method of the dictionary.
  
  Here is a small example using a dictionary:
--- 1713,1721 ----
  value using a non-existent key.
  
! The \code{keys()} method of a dictionary object returns a list of all
! the keys used in the dictionary, in random order (if you want it
! sorted, just apply the \code{sort()} method to the list of keys).  To
! check whether a single key is in the dictionary, use the
! \code{has_key()} method of the dictionary.
  
  Here is a small example using a dictionary:
***************
*** 1902,1907 ****
  These statements are intended to initialize the module.
  They are executed only the
! \emph{first}
! time the module is imported somewhere.\footnote{
          In fact function definitions are also `statements' that are
          `executed'; the execution enters the function name in the
--- 1901,1905 ----
  These statements are intended to initialize the module.
  They are executed only the
! \emph{first} time the module is imported somewhere.\footnote{
          In fact function definitions are also `statements' that are
          `executed'; the execution enters the function name in the
***************
*** 1980,1991 ****
  \file{.pyc} file is ignored if these don't match.
  
! Normally, you don't need to do anything to create the \file{spam.pyc} file.
! Whenever \file{spam.py} is successfully compiled, an attempt is made to
! write the compiled version to \file{spam.pyc}.  It is not an error if
! this attempt fails; if for any reason the file is not written
! completely, the resulting \file{spam.pyc} file will be recognized as
! invalid and thus ignored later.  The contents of the \file{spam.pyc}
! file are platform independent, so a Python module directory can be
! shared by machines of different architectures.
  
  Some tips for experts:
--- 1978,1990 ----
  \file{.pyc} file is ignored if these don't match.
  
! Normally, you don't need to do anything to create the
! \file{spam.pyc} file.  Whenever \file{spam.py} is successfully
! compiled, an attempt is made to write the compiled version to
! \file{spam.pyc}.  It is not an error if this attempt fails; if for any
! reason the file is not written completely, the resulting
! \file{spam.pyc} file will be recognized as invalid and thus ignored
! later.  The contents of the \file{spam.pyc} file are platform
! independent, so a Python module directory can be shared by machines of
! different architectures.
  
  Some tips for experts:
***************
*** 2014,2021 ****
  
  \item
! A program doesn't run any faster when it is read from a
! \file{.pyc} or \file{.pyo} file than when it is read from a \file{.py}
! file; the only thing that's faster about \file{.pyc} or \file{.pyo}
! files is the speed with which they are loaded.
  
  \item
--- 2013,2020 ----
  
  \item
! A program doesn't run any faster when it is read from a \file{.pyc} or
! \file{.pyo} file than when it is read from a \file{.py} file; the only
! thing that's faster about \file{.pyc} or \file{.pyo} files is the
! speed with which they are loaded.
  
  \item
***************
*** 2224,2233 ****
  
  Note that when using \code{from \var{package} import \var{item}}, the
! item can be either a submodule (or subpackage) of the package, or some
  other name defined in the package, like a function, class or
  variable.  The \code{import} statement first tests whether the item is
  defined in the package; if not, it assumes it is a module and attempts
! to load it.  If it fails to find it, an \exception{ImportError}
! exception is raised.
  
  Contrarily, when using syntax like \code{import
--- 2223,2232 ----
  
  Note that when using \code{from \var{package} import \var{item}}, the
! item can be either a submodule (or subpackage) of the package, or some 
  other name defined in the package, like a function, class or
  variable.  The \code{import} statement first tests whether the item is
  defined in the package; if not, it assumes it is a module and attempts
! to load it.  If it fails to find it, an
! \exception{ImportError} exception is raised.
  
  Contrarily, when using syntax like \code{import
***************
*** 2254,2265 ****
  The only solution is for the package author to provide an explicit
  index of the package.  The import statement uses the following
! convention: if a package's \file{__init__.py} code defines a list named
! \code{__all__}, it is taken to be the list of module names that should
! be imported when \code{from \var{package} import *} is encountered.
! It is up to the package author to keep this list up-to-date when a new
! version of the package is released.  Package authors may also decide
! not to support it, if they don't see a use for importing * from their
! package.  For example, the file \file{Sounds/Effects/__init__.py}
! could contain the following code:
  
  \begin{verbatim}
--- 2253,2264 ----
  The only solution is for the package author to provide an explicit
  index of the package.  The import statement uses the following
! convention: if a package's \file{__init__.py} code defines a list
! named \code{__all__}, it is taken to be the list of module names that
! should be imported when \code{from \var{package} import *} is
! encountered.  It is up to the package author to keep this list
! up-to-date when a new version of the package is released.  Package
! authors may also decide not to support it, if they don't see a use for
! importing * from their package.  For example, the file
! \file{Sounds/Effects/__init__.py} could contain the following code:
  
  \begin{verbatim}
***************
*** 2288,2294 ****
  
  In this example, the echo and surround modules are imported in the
! current namespace because they are defined in the \module{Sound.Effects}
! package when the \code{from...import} statement is executed.  (This also
! works when \code{__all__} is defined.)
  
  Note that in general the practicing of importing * from a module or
--- 2287,2293 ----
  
  In this example, the echo and surround modules are imported in the
! current namespace because they are defined in the
! \module{Sound.Effects} package when the \code{from...import} statement
! is executed.  (This also works when \code{__all__} is defined.)
  
  Note that in general the practicing of importing * from a module or
***************
*** 2316,2324 ****
  with the given name.
  
! When packages are structured into subpackages (as with the \module{Sound}
! package in the example), there's no shortcut to refer to submodules of
! sibling packages - the full name of the subpackage must be used.  For
! example, if the module \module{Sound.Filters.vocoder} needs to use the \module{echo}
! module in the \module{Sound.Effects} package, it can use \code{from
  Sound.Effects import echo}.
  
--- 2315,2324 ----
  with the given name.
  
! When packages are structured into subpackages (as with the
! \module{Sound} package in the example), there's no shortcut to refer
! to submodules of sibling packages - the full name of the subpackage
! must be used.  For example, if the module
! \module{Sound.Filters.vocoder} needs to use the \module{echo} module
! in the \module{Sound.Effects} package, it can use \code{from
  Sound.Effects import echo}.
  
***************
*** 2461,2465 ****
  
  \begin{verbatim}
! >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678}
  >>> for name, phone in table.items():
  ...     print '%-10s ==> %10d' % (name, phone)
--- 2461,2465 ----
  
  \begin{verbatim}
! >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 7678}
  >>> for name, phone in table.items():
  ...     print '%-10s ==> %10d' % (name, phone)
***************
*** 2584,2592 ****
  \samp{f.seek(\var{offset}, \var{from_what})}.  The position is
  computed from adding \var{offset} to a reference point; the reference
! point is selected by the \var{from_what} argument.  A \var{from_what}
! value of 0 measures from the beginning of the file, 1 uses the current
! file position, and 2 uses the end of the file as the reference point.
! \var{from_what} can be omitted and defaults to 0, using the beginning
! of the file as the reference point.
  
  \begin{verbatim}
--- 2584,2592 ----
  \samp{f.seek(\var{offset}, \var{from_what})}.  The position is
  computed from adding \var{offset} to a reference point; the reference
! point is selected by the \var{from_what} argument.  A
! \var{from_what} value of 0 measures from the beginning of the file, 1
! uses the current file position, and 2 uses the end of the file as the
! reference point.  \var{from_what} can be omitted and defaults to 0,
! using the beginning of the file as the reference point.
  
  \begin{verbatim}
***************
*** 2613,2619 ****
  \end{verbatim}
  
! File objects have some additional methods, such as \method{isatty()}
! and \method{truncate()} which are less frequently used; consult the
! Library Reference for a complete guide to file objects.
  
  \subsection{The \module{pickle} Module \label{pickle}}
--- 2613,2620 ----
  \end{verbatim}
  
! File objects have some additional methods, such as
! \method{isatty()} and \method{truncate()} which are less frequently
! used; consult the Library Reference for a complete guide to file
! objects.
  
  \subsection{The \module{pickle} Module \label{pickle}}
***************
*** 2657,2666 ****
  complete documentation for \module{pickle} in the Library Reference.)
  
! \module{pickle} is the standard way to make Python objects which can be
! stored and reused by other programs or by a future invocation of the
! same program; the technical term for this is a \dfn{persistent}
! object.  Because \module{pickle} is so widely used, many authors who
! write Python extensions take care to ensure that new data types such
! as matrices can be properly pickled and unpickled.
  
  
--- 2658,2667 ----
  complete documentation for \module{pickle} in the Library Reference.)
  
! \module{pickle} is the standard way to make Python objects which can
! be stored and reused by other programs or by a future invocation of
! the same program; the technical term for this is a
! \dfn{persistent} object.  Because \module{pickle} is so widely used,
! many authors who write Python extensions take care to ensure that new
! data types such as matrices can be properly pickled and unpickled.
  
  
***************
*** 2670,2675 ****
  Until now error messages haven't been more than mentioned, but if you
  have tried out the examples you have probably seen some.  There are
! (at least) two distinguishable kinds of errors: \emph{syntax errors}
! and \emph{exceptions}.
  
  \section{Syntax Errors \label{syntaxErrors}}
--- 2671,2676 ----
  Until now error messages haven't been more than mentioned, but if you
  have tried out the examples you have probably seen some.  There are
! (at least) two distinguishable kinds of errors:
! \emph{syntax errors} and \emph{exceptions}.
  
  \section{Syntax Errors \label{syntaxErrors}}
***************
*** 2687,2697 ****
  
  The parser repeats the offending line and displays a little `arrow'
! pointing at the earliest point in the line where the error was detected.
! The error is caused by (or at least detected at) the token
! \emph{preceding}
! the arrow: in the example, the error is detected at the keyword
! \keyword{print}, since a colon (\character{:}) is missing before it.
! File name and line number are printed so you know where to look in case
! the input came from a script.
  
  \section{Exceptions \label{exceptions}}
--- 2688,2697 ----
  
  The parser repeats the offending line and displays a little `arrow'
! pointing at the earliest point in the line where the error was
! detected.  The error is caused by (or at least detected at) the token
! \emph{preceding} the arrow: in the example, the error is detected at
! the keyword \keyword{print}, since a colon (\character{:}) is missing
! before it.  File name and line number are printed so you know where to
! look in case the input came from a script.
  
  \section{Exceptions \label{exceptions}}
***************
*** 2722,2728 ****
  Exceptions come in different types, and the type is printed as part of
  the message: the types in the example are
! \exception{ZeroDivisionError},
! \exception{NameError}
! and
  \exception{TypeError}.
  The string printed as the exception type is the name of the built-in
--- 2722,2726 ----
  Exceptions come in different types, and the type is printed as part of
  the message: the types in the example are
! \exception{ZeroDivisionError}, \exception{NameError} and
  \exception{TypeError}.
  The string printed as the exception type is the name of the built-in
***************
*** 2977,2982 ****
  in Smalltalk, classes themselves are objects, albeit in the wider
  sense of the word: in Python, all data types are objects.  This
! provides semantics for importing and renaming.  But, just like in \Cpp{}
! or Modula-3, built-in types cannot be used as base classes for
  extension by the user.  Also, like in \Cpp{} but unlike in Modula-3, most
  built-in operators with special syntax (arithmetic operators,
--- 2975,2980 ----
  in Smalltalk, classes themselves are objects, albeit in the wider
  sense of the word: in Python, all data types are objects.  This
! provides semantics for importing and renaming.  But, just like in
! \Cpp{} or Modula-3, built-in types cannot be used as base classes for
  extension by the user.  Also, like in \Cpp{} but unlike in Modula-3, most
  built-in operators with special syntax (arithmetic operators,
***************
*** 3137,3144 ****
  \end{verbatim}
  
! Class definitions, like function definitions (\keyword{def}
! statements) must be executed before they have any effect.  (You could
! conceivably place a class definition in a branch of an \keyword{if}
! statement, or inside a function.)
  
  In practice, the statements inside a class definition will usually be
--- 3135,3142 ----
  \end{verbatim}
  
! Class definitions, like function definitions
! (\keyword{def} statements) must be executed before they have any
! effect.  (You could conceivably place a class definition in a branch
! of an \keyword{if} statement, or inside a function.)
  
  In practice, the statements inside a class definition will usually be
***************
*** 3272,3278 ****
  \code{MyClass.f} is a function, but \code{x.i} is not, since
  \code{MyClass.i} is not.  But \code{x.f} is not the same thing as
! \code{MyClass.f} --- it is a \emph{method object}, not a function
! object.%
! \obindex{method}
  
  
--- 3270,3275 ----
  \code{MyClass.f} is a function, but \code{x.i} is not, since
  \code{MyClass.i} is not.  But \code{x.f} is not the same thing as
! \code{MyClass.f} --- it is a \obindex{method}\emph{method object}, not
! a function object.
  
  
***************
*** 3634,3639 ****
  \end{verbatim}
  
! In the first form, \code{instance} must be an instance of \class{Class}
! or of a class derived from it.  The second form is a shorthand for
  
  \begin{verbatim}
--- 3631,3637 ----
  \end{verbatim}
  
! In the first form, \code{instance} must be an instance of
! \class{Class} or of a class derived from it.  The second form is a
! shorthand for:
  
  \begin{verbatim}
***************
*** 3815,3822 ****
  Automatic completion of variable and module names is optionally
  available.  To enable it in the interpreter's interactive mode, add
! the following to your \file{\$HOME/.pythonrc.py} file:% $ <- bow to font-lock
  \indexii{.pythonrc.py}{file}
! \refstmodindex{rlcompleter}
! \refbimodindex{readline}
  
  \begin{verbatim}
--- 3813,3819 ----
  Automatic completion of variable and module names is optionally
  available.  To enable it in the interpreter's interactive mode, add
! the following to your \file{\$HOME/.pythonrc.py} file:%
  \indexii{.pythonrc.py}{file}
! \refstmodindex{rlcompleter}\refbimodindex{readline}
  
  \begin{verbatim}



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:34:27 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:34:27 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc TODO,1.24.2.1,1.24.2.2
Message-ID: <200002211734.MAA07691@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	TODO 
Log Message:

Removed an item that was strictly cosmetic.


Index: TODO
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/TODO,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -C2 -r1.24.2.1 -r1.24.2.2
*** TODO	2000/02/21 16:12:01	1.24.2.1
--- TODO	2000/02/21 17:34:24	1.24.2.2
***************
*** 56,66 ****
    update submitted by Jim Kerr <jbkerr@sr.hp.com>.
  
- * In the indexes, some subitem entries are separated from the item
-   entries by column- or page-breaks.  Reported by Lorenzo M. Catucci
-   <lorenzo@argon.roma2.infn.it>.  This one will be hard; probably not
-   really worth the pain.  (Only an issue at all when a header-letter
-   and the first index entry get separated -- can change as soon as we
-   change the index entries in the text.)
- 
  
  Library Reference
--- 56,59 ----



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:48:43 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:48:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc Makefile,1.190.2.2,1.190.2.3
Message-ID: <200002211748.MAA07892@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	Makefile 
Log Message:

Remove the source package from the distfiles target; this won't be
used for the 1.5.2p2 release.


Index: Makefile
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/Makefile,v
retrieving revision 1.190.2.2
retrieving revision 1.190.2.3
diff -C2 -r1.190.2.2 -r1.190.2.3
*** Makefile	2000/02/17 17:37:06	1.190.2.2
--- Makefile	2000/02/21 17:48:40	1.190.2.3
***************
*** 283,287 ****
  
  distfiles:	tarballs zips bzips
- 	$(TOOLSDIR)/mksourcepkg --all $(RELEASE)
  
  
--- 283,286 ----



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:49:28 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:49:28 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/perl l2hinit.perl,1.38.4.2,1.38.4.3
Message-ID: <200002211749.MAA07919@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/perl
In directory weyr:/home/fdrake/projects/python/Doc-152p1/perl

Modified Files:
      Tag: release152p1-patches
	l2hinit.perl 
Log Message:

Don't break pages at the subsubsection level; stop at subsections.


Index: l2hinit.perl
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/perl/l2hinit.perl,v
retrieving revision 1.38.4.2
retrieving revision 1.38.4.3
diff -C2 -r1.38.4.2 -r1.38.4.3
*** l2hinit.perl	1999/11/12 19:51:42	1.38.4.2
--- l2hinit.perl	2000/02/21 17:49:26	1.38.4.3
***************
*** 17,20 ****
--- 17,21 ----
  
  $MAX_LINK_DEPTH = 2;
+ $MAX_SPLIT_DEPTH = 5;      # split at subsections but not sub-subsections
  $ADDRESS = '';
  



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 17:59:50 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 12:59:50 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python ceval.c,2.166,2.167
Message-ID: <200002211759.MAA08122@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory weyr:/home/fdrake/projects/python/Python

Modified Files:
	ceval.c 
Log Message:

Remove comment that Guido agree's doesn't make sense:
PyEval_EvalCode() is *not* a "backward compatible interface", it's the 
one to use!


Index: ceval.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/ceval.c,v
retrieving revision 2.166
retrieving revision 2.167
diff -C2 -r2.166 -r2.167
*** ceval.c	2000/01/12 22:45:54	2.166
--- ceval.c	2000/02/21 17:59:48	2.167
***************
*** 314,319 ****
  
  
- /* Backward compatible interface */
- 
  PyObject *
  PyEval_EvalCode(co, globals, locals)
--- 314,317 ----



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 18:04:43 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 13:04:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.10,1.56.2.11
Message-ID: <200002211804.NAA08173@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p1/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Per Guido's suggestion, mark PyFile_SoftSpace() as for internal use
only.


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.10
retrieving revision 1.56.2.11
diff -C2 -r1.56.2.10 -r1.56.2.11
*** api.tex	2000/02/21 16:52:23	1.56.2.10
--- api.tex	2000/02/21 18:04:40	1.56.2.11
***************
*** 2544,2547 ****
--- 2544,2548 ----
  
  \begin{cfuncdesc}{int}{PyFile_SoftSpace}{PyObject *p, int newflag}
+ This function exists for internal use by the interpreter.
  Sets the \member{softspace} attribute of \var{p} to \var{newflag}.
  Returns the previous value.  \var{p} does not have to be a file object 



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 18:05:41 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 13:05:41 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc TODO,1.24.2.2,1.24.2.3
Message-ID: <200002211805.NAA08192@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	TODO 
Log Message:

Remove note about weird comment in PyEval_EvalCode() source.


Index: TODO
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/TODO,v
retrieving revision 1.24.2.2
retrieving revision 1.24.2.3
diff -C2 -r1.24.2.2 -r1.24.2.3
*** TODO	2000/02/21 17:34:24	1.24.2.2
--- TODO	2000/02/21 18:05:39	1.24.2.3
***************
*** 18,23 ****
    requested by Greg Kochanski <gpk@bell-labs.com>.
  
! * PyEval_EvalCode() must also be documented.  Ask Guido about source
!   comment: "Backward compatible interface".
  
  * Break up the PyBufferProcs description so that the function types
--- 18,22 ----
    requested by Greg Kochanski <gpk@bell-labs.com>.
  
! * PyEval_EvalCode() must also be documented.
  
  * Break up the PyBufferProcs description so that the function types



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 18:10:12 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 13:10:12 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.11,1.56.2.12
Message-ID: <200002211810.NAA08244@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p1/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Wrap up a couple of nits for PyErr_SetInterrupt().


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.11
retrieving revision 1.56.2.12
diff -C2 -r1.56.2.11 -r1.56.2.12
*** api.tex	2000/02/21 18:04:40	1.56.2.11
--- api.tex	2000/02/21 18:10:09	1.56.2.12
***************
*** 879,886 ****
  
  \begin{cfuncdesc}{void}{PyErr_SetInterrupt}{}
! This function is obsolete (XXX or platform dependent?).  It simulates
  the effect of a \constant{SIGINT} signal arriving --- the next time
  \cfunction{PyErr_CheckSignals()} is called,
  \exception{KeyboadInterrupt} will be raised.
  \end{cfuncdesc}
  
--- 879,887 ----
  
  \begin{cfuncdesc}{void}{PyErr_SetInterrupt}{}
! This function is obsolete.  It simulates
  the effect of a \constant{SIGINT} signal arriving --- the next time
  \cfunction{PyErr_CheckSignals()} is called,
  \exception{KeyboadInterrupt} will be raised.
+ It may be called without holding the interpreter lock.
  \end{cfuncdesc}
  



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 18:19:09 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 13:19:09 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules parsermodule.c,2.35,2.36
Message-ID: <200002211819.NAA08321@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory weyr:/home/fdrake/projects/python/Modules

Modified Files:
	parsermodule.c 
Log Message:

What used to be tp_xxx4 is now tp_flags; set it to Py_TPFLAGS_DEFAULT.


Index: parsermodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/parsermodule.c,v
retrieving revision 2.35
retrieving revision 2.36
diff -C2 -r2.35 -r2.36
*** parsermodule.c	1999/09/20 22:32:18	2.35
--- parsermodule.c	2000/02/21 18:19:06	2.36
***************
*** 233,238 ****
      0,					/* tp_as_buffer		*/
  
!     /* Space for future expansion */
!     0,					/* tp_xxx4		*/
  
      /* __doc__ */
--- 233,237 ----
      0,					/* tp_as_buffer		*/
  
!     Py_TPFLAGS_DEFAULT,			/* tp_flags		*/
  
      /* __doc__ */



From fdrake@weyr.cnri.reston.va.us  Mon Feb 21 21:04:14 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 16:04:14 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc TODO,1.24.2.3,1.24.2.4
Message-ID: <200002212104.QAA08854@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	TODO 
Log Message:

Note that Py_AddPendingCall() is undocumented.


Index: TODO
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/TODO,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -C2 -r1.24.2.3 -r1.24.2.4
*** TODO	2000/02/21 18:05:39	1.24.2.3
--- TODO	2000/02/21 21:04:11	1.24.2.4
***************
*** 18,22 ****
    requested by Greg Kochanski <gpk@bell-labs.com>.
  
! * PyEval_EvalCode() must also be documented.
  
  * Break up the PyBufferProcs description so that the function types
--- 18,22 ----
    requested by Greg Kochanski <gpk@bell-labs.com>.
  
! * PyEval_EvalCode(), Py_AddPendingCall() must also be documented.
  
  * Break up the PyBufferProcs description so that the function types



From jhylton@cnri.reston.va.us  Mon Feb 21 22:46:03 2000
From: jhylton@cnri.reston.va.us (Jeremy Hylton)
Date: Mon, 21 Feb 2000 17:46:03 -0500
Subject: [Python-checkins] CVS: /python/nondist/src/Compiler misc.py,1.4,1.5 pyassem.py,1.5,1.6
Message-ID: <200002212246.RAA01846@goon.cnri.reston.va.us>

Update of /projects/cvsroot//python/nondist/src/Compiler
In directory goon.cnri.reston.va.us:/home/jhylton/python/nondist/src/Compiler

Modified Files:
	misc.py pyassem.py 
Log Message:
satisfy the tabnanny (thanks to MH for noticing the problem)


Index: misc.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/misc.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** misc.py	2000/02/16 00:49:47	1.4
--- misc.py	2000/02/21 22:46:00	1.5
***************
*** 12,24 ****
  class Set:
      def __init__(self):
! 	self.elts = {}
      def __len__(self):
          return len(self.elts)
      def add(self, elt):
! 	self.elts[elt] = elt
      def items(self):
! 	return self.elts.keys()
      def has_elt(self, elt):
! 	return self.elts.has_key(elt)
      def remove(self, elt):
          del self.elts[elt]
--- 12,24 ----
  class Set:
      def __init__(self):
!         self.elts = {}
      def __len__(self):
          return len(self.elts)
      def add(self, elt):
!         self.elts[elt] = elt
      def items(self):
!         return self.elts.keys()
      def has_elt(self, elt):
!         return self.elts.has_key(elt)
      def remove(self, elt):
          del self.elts[elt]
***************
*** 26,35 ****
  class Stack:
      def __init__(self):
! 	self.stack = []
! 	self.pop = self.stack.pop
      def __len__(self):
          return len(self.stack)
      def push(self, elt):
! 	self.stack.append(elt)
      def top(self):
! 	return self.stack[-1]
--- 26,35 ----
  class Stack:
      def __init__(self):
!         self.stack = []
!         self.pop = self.stack.pop
      def __len__(self):
          return len(self.stack)
      def push(self, elt):
!         self.stack.append(elt)
      def top(self):
!         return self.stack[-1]

Index: pyassem.py
===================================================================
RCS file: /projects/cvsroot//python/nondist/src/Compiler/pyassem.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pyassem.py	2000/02/17 22:58:54	1.5
--- pyassem.py	2000/02/21 22:46:00	1.6
***************
*** 61,65 ****
                   docstring=None):
          # XXX why is the default value for flags 3?
! 	self.insts = []
          # used by makeCodeObject
          self._getArgCount(args)
--- 61,65 ----
                   docstring=None):
          # XXX why is the default value for flags 3?
!         self.insts = []
          # used by makeCodeObject
          self._getArgCount(args)
***************
*** 108,115 ****
  
      def getCurInst(self):
! 	return len(self.insts)
  
      def getNextInst(self):
! 	return len(self.insts) + 1
  
      def dump(self, io=sys.stdout):
--- 108,115 ----
  
      def getCurInst(self):
!         return len(self.insts)
  
      def getNextInst(self):
!         return len(self.insts) + 1
  
      def dump(self, io=sys.stdout):
***************
*** 163,167 ****
          if self.flags & CO_VARKEYWORDS:
              self.argcount = self.argcount - 1
! 	stacksize = findDepth(self.insts)
          try:
              co = new.code(self.argcount, nlocals, stacksize,
--- 163,167 ----
          if self.flags & CO_VARKEYWORDS:
              self.argcount = self.argcount - 1
!         stacksize = findDepth(self.insts)
          try:
              co = new.code(self.argcount, nlocals, stacksize,
***************
*** 194,200 ****
          l = []
          for elt in self.consts:
! 	    # XXX might be clearer to just as isinstance(CodeGen)
! 	    if hasattr(elt, 'asConst'):
! 		l.append(elt.asConst())
              else:
                  l.append(elt)
--- 194,200 ----
          l = []
          for elt in self.consts:
!             # XXX might be clearer to just as isinstance(CodeGen)
!             if hasattr(elt, 'asConst'):
!                 l.append(elt.asConst())
              else:
                  l.append(elt)
***************
*** 287,291 ****
      opnum = {}
      for num in range(len(dis.opname)):
! 	opnum[dis.opname[num]] = num
  
      # this version of emit + arbitrary hooks might work, but it's damn
--- 287,291 ----
      opnum = {}
      for num in range(len(dis.opname)):
!         opnum[dis.opname[num]] = num
  
      # this version of emit + arbitrary hooks might work, but it's damn
***************
*** 294,298 ****
      def emit(self, *args):
          self._emitDispatch(args[0], args[1:])
! 	self.insts.append(args)
  
      def _emitDispatch(self, type, args):
--- 294,298 ----
      def emit(self, *args):
          self._emitDispatch(args[0], args[1:])
!         self.insts.append(args)
  
      def _emitDispatch(self, type, args):
***************
*** 364,381 ****
  
      def __init__(self, id=None, val=None):
! 	if id is None:
! 	    id = StackRef.count
! 	    StackRef.count = StackRef.count + 1
! 	self.id = id
! 	self.val = val
  
      def __repr__(self):
! 	if self.val:
! 	    return "StackRef(val=%d)" % self.val
! 	else:
! 	    return "StackRef(id=%d)" % self.id
  
      def bind(self, inst):
! 	self.val = inst
  
      def resolve(self):
--- 364,381 ----
  
      def __init__(self, id=None, val=None):
!         if id is None:
!             id = StackRef.count
!             StackRef.count = StackRef.count + 1
!         self.id = id
!         self.val = val
  
      def __repr__(self):
!         if self.val:
!             return "StackRef(val=%d)" % self.val
!         else:
!             return "StackRef(id=%d)" % self.id
  
      def bind(self, inst):
!         self.val = inst
  
      def resolve(self):
***************
*** 383,387 ****
              print "UNRESOLVE REF", self
              return 0
! 	return self.val
  
  class StackDepthTracker:
--- 383,387 ----
              print "UNRESOLVE REF", self
              return 0
!         return self.val
  
  class StackDepthTracker:
***************
*** 389,455 ****
  
      def findDepth(self, insts):
! 	depth = 0
! 	maxDepth = 0
! 	for i in insts:
! 	    opname = i[0]
! 	    delta = self.effect.get(opname, 0)
! 	    if delta > 1:
! 		depth = depth + delta
! 	    elif delta < 0:
! 		if depth > maxDepth:
! 		    maxDepth = depth
! 		depth = depth + delta
! 	    else:
! 		if depth > maxDepth:
! 		    maxDepth = depth
! 		# now check patterns
! 		for pat, delta in self.patterns:
! 		    if opname[:len(pat)] == pat:
! 			depth = depth + delta
! 			break
! 		# if we still haven't found a match
! 		if delta == 0:
! 		    meth = getattr(self, opname)
! 		    depth = depth + meth(i[1])
! 	    if depth < 0:
! 		depth = 0
! 	return maxDepth
  
      effect = {
! 	'POP_TOP': -1,
! 	'DUP_TOP': 1,
! 	'SLICE+1': -1,
! 	'SLICE+2': -1,
! 	'SLICE+3': -2,
! 	'STORE_SLICE+0': -1,
! 	'STORE_SLICE+1': -2,
! 	'STORE_SLICE+2': -2,
! 	'STORE_SLICE+3': -3,
! 	'DELETE_SLICE+0': -1,
! 	'DELETE_SLICE+1': -2,
! 	'DELETE_SLICE+2': -2,
! 	'DELETE_SLICE+3': -3,
! 	'STORE_SUBSCR': -3,
! 	'DELETE_SUBSCR': -2,
! 	# PRINT_EXPR?
! 	'PRINT_ITEM': -1,
! 	'LOAD_LOCALS': 1,
! 	'RETURN_VALUE': -1,
! 	'EXEC_STMT': -2,
! 	'BUILD_CLASS': -2,
! 	'STORE_NAME': -1,
! 	'STORE_ATTR': -2,
! 	'DELETE_ATTR': -1,
! 	'STORE_GLOBAL': -1,
! 	'BUILD_MAP': 1,
! 	'COMPARE_OP': -1,
! 	'STORE_FAST': -1,
! 	}
      # use pattern match
      patterns = [
! 	('BINARY_', -1),
! 	('LOAD_', 1),
! 	('IMPORT_', 1),
! 	]
      # special cases
  
--- 389,455 ----
  
      def findDepth(self, insts):
!         depth = 0
!         maxDepth = 0
!         for i in insts:
!             opname = i[0]
!             delta = self.effect.get(opname, 0)
!             if delta > 1:
!                 depth = depth + delta
!             elif delta < 0:
!                 if depth > maxDepth:
!                     maxDepth = depth
!                 depth = depth + delta
!             else:
!                 if depth > maxDepth:
!                     maxDepth = depth
!                 # now check patterns
!                 for pat, delta in self.patterns:
!                     if opname[:len(pat)] == pat:
!                         depth = depth + delta
!                         break
!                 # if we still haven't found a match
!                 if delta == 0:
!                     meth = getattr(self, opname)
!                     depth = depth + meth(i[1])
!             if depth < 0:
!                 depth = 0
!         return maxDepth
  
      effect = {
!         'POP_TOP': -1,
!         'DUP_TOP': 1,
!         'SLICE+1': -1,
!         'SLICE+2': -1,
!         'SLICE+3': -2,
!         'STORE_SLICE+0': -1,
!         'STORE_SLICE+1': -2,
!         'STORE_SLICE+2': -2,
!         'STORE_SLICE+3': -3,
!         'DELETE_SLICE+0': -1,
!         'DELETE_SLICE+1': -2,
!         'DELETE_SLICE+2': -2,
!         'DELETE_SLICE+3': -3,
!         'STORE_SUBSCR': -3,
!         'DELETE_SUBSCR': -2,
!         # PRINT_EXPR?
!         'PRINT_ITEM': -1,
!         'LOAD_LOCALS': 1,
!         'RETURN_VALUE': -1,
!         'EXEC_STMT': -2,
!         'BUILD_CLASS': -2,
!         'STORE_NAME': -1,
!         'STORE_ATTR': -2,
!         'DELETE_ATTR': -1,
!         'STORE_GLOBAL': -1,
!         'BUILD_MAP': 1,
!         'COMPARE_OP': -1,
!         'STORE_FAST': -1,
!         }
      # use pattern match
      patterns = [
!         ('BINARY_', -1),
!         ('LOAD_', 1),
!         ('IMPORT_', 1),
!         ]
      # special cases
  
***************
*** 457,477 ****
      # BUILD_LIST, CALL_FUNCTION, MAKE_FUNCTION, BUILD_SLICE
      def UNPACK_TUPLE(self, count):
! 	return count
      def UNPACK_LIST(self, count):
! 	return count
      def BUILD_TUPLE(self, count):
! 	return -count
      def BUILD_LIST(self, count):
! 	return -count
      def CALL_FUNCTION(self, argc):
! 	hi, lo = divmod(argc, 256)
! 	return lo + hi * 2
      def MAKE_FUNCTION(self, argc):
! 	return -argc
      def BUILD_SLICE(self, argc):
! 	if argc == 2:
! 	    return -1
! 	elif argc == 3:
! 	    return -2
      
  findDepth = StackDepthTracker().findDepth
--- 457,477 ----
      # BUILD_LIST, CALL_FUNCTION, MAKE_FUNCTION, BUILD_SLICE
      def UNPACK_TUPLE(self, count):
!         return count
      def UNPACK_LIST(self, count):
!         return count
      def BUILD_TUPLE(self, count):
!         return -count
      def BUILD_LIST(self, count):
!         return -count
      def CALL_FUNCTION(self, argc):
!         hi, lo = divmod(argc, 256)
!         return lo + hi * 2
      def MAKE_FUNCTION(self, argc):
!         return -argc
      def BUILD_SLICE(self, argc):
!         if argc == 2:
!             return -1
!         elif argc == 3:
!             return -2
      
  findDepth = StackDepthTracker().findDepth



From guido@cnri.reston.va.us  Tue Feb 22 00:20:01 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 21 Feb 2000 19:20:01 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle ScriptBinding.py,1.7,1.8
Message-ID: <200002220020.TAA04387@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Modified Files:
	ScriptBinding.py 
Log Message:
Added a new command: Check module (Alt-F5) It does a full syntax check
of the current module.  It also runs the tabnanny to catch any
inconsistent tabs.

Also did a little bit of refactoring: added an errorbox() method to
simplify the display of error dialogs.


Index: ScriptBinding.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/idle/ScriptBinding.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** ScriptBinding.py	1999/06/01 18:18:27	1.7
--- ScriptBinding.py	2000/02/22 00:19:58	1.8
***************
*** 1,7 ****
  """Extension to execute code outside the Python shell window.
  
! This adds two commands (to the Edit menu, until there's a separate
! Python menu):
  
  - Import module (F5) is equivalent to either import or reload of the
  current module.  The window must have been saved previously. The
--- 1,10 ----
  """Extension to execute code outside the Python shell window.
  
! This adds the following commands (to the Edit menu, until there's a
! separate Python menu):
  
+ - Check module (Alt-F5) does a full syntax check of the current module.
+ It also runs the tabnanny to catch any inconsistent tabs.
+ 
  - Import module (F5) is equivalent to either import or reload of the
  current module.  The window must have been saved previously. The
***************
*** 19,26 ****
--- 22,41 ----
  import tkMessageBox
  
+ indent_message = """Error: Inconsistent indentation detected!
+ 
+ This means that either:
+ 
+ (1) your indentation is outright incorrect (easy to fix), or
+ 
+ (2) your indentation mixes tabs and spaces in a way that depends on \
+ how many spaces a tab is worth.
  
+ To fix case 2, change all tabs to spaces by using Select All followed \
+ by Untabify Region (both in the Edit menu)."""
+ 
  class ScriptBinding:
      
      keydefs = {
+         '<<check-module>>': ['<Alt-F5>', '<Meta-F5>'],
          '<<import-module>>': ['<F5>'],
          '<<run-script>>': ['<Control-F5>'],
***************
*** 29,32 ****
--- 44,48 ----
      menudefs = [
          ('edit', [None,
+                   ('Check module', '<<check-module>>'),
                    ('Import module', '<<import-module>>'),
                    ('Run script', '<<run-script>>'),
***************
*** 42,45 ****
--- 58,114 ----
          self.root = self.flist.root
  
+     def check_module_event(self, event):
+         filename = self.getfilename()
+         if not filename:
+             return
+         if not self.tabnanny(filename):
+             return
+         if not self.checksyntax(filename):
+             return
+ 
+     def tabnanny(self, filename):
+         import tabnanny
+         import tokenize
+         tabnanny.reset_globals()
+         f = open(filename, 'r')
+         try:
+             tokenize.tokenize(f.readline, tabnanny.tokeneater)
+         except tokenize.TokenError, msg:
+             self.errorbox("Token error",
+                           "Token error:\n%s" % str(msg))
+             return 0
+         except tabnanny.NannyNag, nag:
+             # The error messages from tabnanny are too confusing...
+             self.editwin.gotoline(nag.get_lineno())
+             self.errorbox("Tab/space error", indent_message)
+             return 0
+         return 1
+ 
+     def checksyntax(self, filename):
+         f = open(filename, 'r')
+         source = f.read()
+         f.close()
+         if '\r' in source:
+             import re
+             source = re.sub(r"\r\n", "\n", source)
+         if source and source[-1] != '\n':
+             source = source + '\n'
+         try:
+             compile(source, filename, "exec")
+         except (SyntaxError, OverflowError), err:
+             try:
+                 msg, (errorfilename, lineno, offset, line) = err
+                 if not errorfilename:
+                     err.args = msg, (filename, lineno, offset, line)
+                     err.filename = filename
+             except:
+                 lineno = None
+                 msg = "*** " + str(err)
+             if lineno:
+                 self.editwin.gotoline(lineno)
+             self.errorbox("Syntax error",
+                           "There's an error in your program:\n" + msg)
+         return 1
+ 
      def import_module_event(self, event):
          filename = self.getfilename()
***************
*** 76,79 ****
--- 145,149 ----
          if (not sys.argv or
              os.path.basename(sys.argv[0]) != os.path.basename(filename)):
+             # XXX Too often this discards arguments the user just set...
              sys.argv = [filename]
          interp.execfile(filename)
***************
*** 81,96 ****
      def getfilename(self):
          # Logic to make sure we have a saved filename
          if not self.editwin.get_saved():
!             tkMessageBox.showerror("Not saved",
!                                    "Please save first!",
!                                    master=self.editwin.text)
              self.editwin.text.focus_set()
              return
          filename = self.editwin.io.filename
          if not filename:
!             tkMessageBox.showerror("No file name",
!                                    "This window has no file name",
!                                    master=self.editwin.text)
!             self.editwin.text.focus_set()
              return
          return filename
--- 151,169 ----
      def getfilename(self):
          # Logic to make sure we have a saved filename
+         # XXX Better logic would offer to save!
          if not self.editwin.get_saved():
!             self.errorbox("Not saved",
!                           "Please save first!")
              self.editwin.text.focus_set()
              return
          filename = self.editwin.io.filename
          if not filename:
!             self.errorbox("No file name",
!                           "This window has no file name")
              return
          return filename
+ 
+     def errorbox(self, title, message):
+         # XXX This should really be a function of EditorWindow...
+         tkMessageBox.showerror(title, message, master=self.editwin.text)
+         self.editwin.text.focus_set()



From guido@cnri.reston.va.us  Tue Feb 22 00:20:39 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 21 Feb 2000 19:20:39 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle tabnanny.py,NONE,1.1
Message-ID: <200002220020.TAA04408@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/idle
In directory eric:/projects/python/develop/guido/src/Tools/idle

Added Files:
	tabnanny.py 
Log Message:
Another copy of a file that already exists elsewhere: tabnanny.py.

It's clear that this really needs to move to the Lib directory!






From fdrake@acm.org  Tue Feb 22 04:25:20 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Mon, 21 Feb 2000 23:25:20 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle tabnanny.py,NONE,1.1
In-Reply-To: <200002220020.TAA04408@eric.cnri.reston.va.us>
References: <200002220020.TAA04408@eric.cnri.reston.va.us>
Message-ID: <14514.4016.592050.87060@weyr.cnri.reston.va.us>

Guido van Rossum writes:
 > It's clear that this really needs to move to the Lib directory!

  So document it!


  -Fred


From fdrake@weyr.cnri.reston.va.us  Tue Feb 22 04:34:32 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 21 Feb 2000 23:34:32 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tut tut.tex,1.100.2.4,1.100.2.5
Message-ID: <200002220434.XAA09464@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tut
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tut

Modified Files:
      Tag: release152p1-patches
	tut.tex 
Log Message:

When introducing if statements, don't use:

#  [Code which sets 'x' to a value...]

to indicate that x should be set; set it!  This confusion was
indicated in a question to python-docs from
<constantina.s@virginnet.co.uk>.


Index: tut.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tut/tut.tex,v
retrieving revision 1.100.2.4
retrieving revision 1.100.2.5
diff -C2 -r1.100.2.4 -r1.100.2.5
*** tut.tex	2000/02/21 17:21:18	1.100.2.4
--- tut.tex	2000/02/22 04:34:28	1.100.2.5
***************
*** 913,917 ****
  
  \begin{verbatim}
! >>> #  [Code which sets 'x' to a value...]
  >>> if x < 0:
  ...      x = 0
--- 913,918 ----
  
  \begin{verbatim}
! >>> import random
! >>> x = random.choice([-1, 0, 1, 2])
  >>> if x < 0:
  ...      x = 0



From fdrake@weyr.cnri.reston.va.us  Tue Feb 22 17:26:05 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 22 Feb 2000 12:26:05 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/tut tut.tex,1.100.2.5,1.100.2.6
Message-ID: <200002221726.MAA10402@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/tut
In directory weyr:/home/fdrake/projects/python/Doc-152p1/tut

Modified Files:
      Tag: release152p1-patches
	tut.tex 
Log Message:

Adjust the examples starting the "if Statement" and "Handling
Exceptions" based on comments from Peter Funk <pf@artcom-gmbh.de>;
these should be more "approachable" for novice programmers.


Index: tut.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/tut/tut.tex,v
retrieving revision 1.100.2.5
retrieving revision 1.100.2.6
diff -C2 -r1.100.2.5 -r1.100.2.6
*** tut.tex	2000/02/22 04:34:28	1.100.2.5
--- tut.tex	2000/02/22 17:26:02	1.100.2.6
***************
*** 913,918 ****
  
  \begin{verbatim}
! >>> import random
! >>> x = random.choice([-1, 0, 1, 2])
  >>> if x < 0:
  ...      x = 0
--- 913,917 ----
  
  \begin{verbatim}
! >>> x = int(raw_input("Please enter a number: "))
  >>> if x < 0:
  ...      x = 0
***************
*** 2747,2766 ****
  
  It is possible to write programs that handle selected exceptions.
! Look at the following example, which prints a table of inverses of
! some floating point numbers:
  
  \begin{verbatim}
! >>> numbers = [0.3333, 2.5, 0, 10]
! >>> for x in numbers:
! ...     print x,
  ...     try:
! ...         print 1.0 / x
! ...     except ZeroDivisionError:
! ...         print '*** has no inverse ***'
  ...     
- 0.3333 3.00030003
- 2.5 0.4
- 0 *** has no inverse ***
- 10 0.1
  \end{verbatim}
  
--- 2746,2763 ----
  
  It is possible to write programs that handle selected exceptions.
! Look at the following example, which asks the user for input until a
! valid integer has been entered, but allows the user to interrupt the
! program (using \kbd{Control-C} or whatever the operating system
! supports); note that a user-generated interruption is signalled by
! raising the \exception{KeyboardInterrupt} exception.
  
  \begin{verbatim}
! >>> while 1:
  ...     try:
! ...         x = int(raw_input("Please enter a number: "))
! ...         break
! ...     except ValueError:
! ...         print "Oops! That was no valid number.  Try again..."
  ...     
  \end{verbatim}
  



From fdrake@weyr.cnri.reston.va.us  Tue Feb 22 18:20:07 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 22 Feb 2000 13:20:07 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/texinputs boilerplate.tex,1.38,1.39
Message-ID: <200002221820.NAA11073@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/texinputs
In directory weyr:/home/fdrake/projects/python/Doc/texinputs

Modified Files:
	boilerplate.tex 
Log Message:

This branch is for 1.6 & forward.


Index: boilerplate.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/texinputs/boilerplate.tex,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** boilerplate.tex	1999/11/18 20:57:36	1.38
--- boilerplate.tex	2000/02/22 18:20:03	1.39
***************
*** 4,10 ****
  	Corporation for National Research Initiatives (CNRI) \\
  	1895 Preston White Drive, Reston, Va 20191, USA \\
! 	E-mail: \email{guido@CNRI.Reston.Va.US}, \email{guido@python.org}
  }
  
  \date{\today}			% XXX update before release!
! \release{1.5.2$+$}
--- 4,10 ----
  	Corporation for National Research Initiatives (CNRI) \\
  	1895 Preston White Drive, Reston, Va 20191, USA \\
! 	E-mail: \email{guido@python.org}
  }
  
  \date{\today}			% XXX update before release!
! \release{1.6}



From guido@python.org  Tue Feb 22 18:53:29 2000
From: guido@python.org (Guido van Rossum)
Date: Tue, 22 Feb 2000 13:53:29 -0500
Subject: [Python-checkins] CVS: python/dist/src/Tools/idle tabnanny.py,NONE,1.1
In-Reply-To: Your message of "Mon, 21 Feb 2000 23:25:20 EST."
 <14514.4016.592050.87060@weyr.cnri.reston.va.us>
References: <200002220020.TAA04408@eric.cnri.reston.va.us>
 <14514.4016.592050.87060@weyr.cnri.reston.va.us>
Message-ID: <200002221853.NAA05456@eric.cnri.reston.va.us>

>   So document it!

Easier said than done.  It was written as a script only.  What really
needs to happen first is to restructure it so that it's easier to use
as a module.  Also, the error messages it generates suck.

--Guido van Rossum (home page: http://www.python.org/~guido/)


From guido@cnri.reston.va.us  Wed Feb 23 15:32:22 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 23 Feb 2000 10:32:22 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib tabnanny.py,1.9,1.10
Message-ID: <200002231532.KAA07188@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	tabnanny.py 
Log Message:
Added tabnanny.py, by Tim Peters, formerly from Tools/scripts, to the
standard library.  Added some comments:

# XXX Note: this is now a standard library module.
# XXX The API needs to undergo changes however; the current code is too
# XXX script-like.  This will be addressed later.


Index: tabnanny.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/tabnanny.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** tabnanny.py	1999/07/30 17:48:20	1.9
--- tabnanny.py	2000/02/23 15:32:19	1.10
***************
*** 5,8 ****
--- 5,12 ----
  # Released to the public domain, by Tim Peters, 15 April 1998.
  
+ # XXX Note: this is now a standard library module.
+ # XXX The API needs to undergo changes however; the current code is too
+ # XXX script-like.  This will be addressed later.
+ 
  __version__ = "6"
  



From guido@cnri.reston.va.us  Wed Feb 23 15:33:55 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 23 Feb 2000 10:33:55 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts tabnanny.py,1.9,NONE
Message-ID: <200002231533.KAA07236@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Removed Files:
	tabnanny.py 
Log Message:
Moved tabnanny.py to standard library status.




From guido@cnri.reston.va.us  Wed Feb 23 15:34:46 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 23 Feb 2000 10:34:46 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts tabpolice.py,1.4,NONE
Message-ID: <200002231534.KAA07256@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Removed Files:
	tabpolice.py 
Log Message:
Deleting tabpolice.py; it was superceded by tabnanny.py long ago.




From fdrake@weyr.cnri.reston.va.us  Wed Feb 23 15:44:11 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 23 Feb 2000 10:44:11 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libtabnanny.tex,NONE,1.1
Message-ID: <200002231544.KAA16548@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc/lib

Added Files:
	libtabnanny.tex 
Log Message:

Initial version from Peter Funk <pf@artcom-gmbh.de>, with minor
consistency changes and a note that the API may change in the future.





From fdrake@weyr.cnri.reston.va.us  Wed Feb 23 15:44:36 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 23 Feb 2000 10:44:36 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc Makefile.deps,1.26,1.27
Message-ID: <200002231544.KAA16574@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc

Modified Files:
	Makefile.deps 
Log Message:

Added dependency on libtabnanny.tex.


Index: Makefile.deps
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/Makefile.deps,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** Makefile.deps	1999/10/29 20:49:22	1.26
--- Makefile.deps	2000/02/23 15:44:34	1.27
***************
*** 197,200 ****
--- 197,201 ----
  	../lib/libpyclbr.tex \
  	../lib/libtokenize.tex \
+ 	../lib/libtabnanny.tex \
  	../lib/libmhlib.tex \
  	../lib/libtelnetlib.tex \



From fdrake@weyr.cnri.reston.va.us  Wed Feb 23 15:45:01 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 23 Feb 2000 10:45:01 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib lib.tex,1.147,1.148
Message-ID: <200002231545.KAA16599@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc/lib

Modified Files:
	lib.tex 
Log Message:

Added entry for libtabnanny.tex.


Index: lib.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/lib.tex,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -r1.147 -r1.148
*** lib.tex	1999/11/10 16:21:36	1.147
--- lib.tex	2000/02/23 15:44:58	1.148
***************
*** 91,94 ****
--- 91,95 ----
  \input{libkeyword}
  \input{libtokenize}
+ \input{libtabnanny}
  \input{libpyclbr}
  \input{libcode}



From fdrake@weyr.cnri.reston.va.us  Wed Feb 23 15:47:19 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Wed, 23 Feb 2000 10:47:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects dictobject.c,2.48,2.49
Message-ID: <200002231547.KAA16647@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory weyr:/home/fdrake/projects/python/Objects

Modified Files:
	dictobject.c 
Log Message:

dict_has_key():  Accept only one parameter.  PR#210 reported by
                 Andreas Jung <ajung@sz-sb.de>.


Index: dictobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/dictobject.c,v
retrieving revision 2.48
retrieving revision 2.49
diff -C2 -r2.48 -r2.49
*** dictobject.c	1999/03/24 19:06:42	2.48
--- dictobject.c	2000/02/23 15:47:16	2.49
***************
*** 960,964 ****
  	long hash;
  	register long ok;
! 	if (!PyArg_Parse(args, "O", &key))
  		return NULL;
  #ifdef CACHE_HASH
--- 960,964 ----
  	long hash;
  	register long ok;
! 	if (!PyArg_ParseTuple(args, "O:has_key", &key))
  		return NULL;
  #ifdef CACHE_HASH
***************
*** 985,989 ****
  	long hash;
  
! 	if (!PyArg_ParseTuple(args, "O|O", &key, &failobj))
  		return NULL;
  	if (mp->ma_table == NULL)
--- 985,989 ----
  	long hash;
  
! 	if (!PyArg_ParseTuple(args, "O|O:get", &key, &failobj))
  		return NULL;
  	if (mp->ma_table == NULL)
***************
*** 1022,1026 ****
  
  static PyMethodDef mapp_methods[] = {
! 	{"has_key",	(PyCFunction)dict_has_key},
  	{"keys",	(PyCFunction)dict_keys},
  	{"items",	(PyCFunction)dict_items},
--- 1022,1026 ----
  
  static PyMethodDef mapp_methods[] = {
! 	{"has_key",	(PyCFunction)dict_has_key,      METH_VARARGS},
  	{"keys",	(PyCFunction)dict_keys},
  	{"items",	(PyCFunction)dict_items},
***************
*** 1029,1033 ****
  	{"clear",	(PyCFunction)dict_clear},
  	{"copy",	(PyCFunction)dict_copy},
! 	{"get",         (PyCFunction)dict_get, 1},
  	{NULL,		NULL}		/* sentinel */
  };
--- 1029,1033 ----
  	{"clear",	(PyCFunction)dict_clear},
  	{"copy",	(PyCFunction)dict_copy},
! 	{"get",         (PyCFunction)dict_get,          METH_VARARGS},
  	{NULL,		NULL}		/* sentinel */
  };



From akuchlin@CNRI.Reston.VA.US  Wed Feb 23 22:18:52 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Wed, 23 Feb 2000 17:18:52 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python ceval.c,2.167,2.168
Message-ID: <200002232218.RAA01112@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory amarok:/home/akuchlin/src/Python-1.5/Python

Modified Files:
	ceval.c 
Log Message:
Allow using long integers as slice indexes


Index: ceval.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/ceval.c,v
retrieving revision 2.167
retrieving revision 2.168
diff -C2 -r2.167 -r2.168
*** ceval.c	2000/02/21 17:59:48	2.167
--- ceval.c	2000/02/23 22:18:48	2.168
***************
*** 2536,2545 ****
  	if (v != NULL) {
  		long x;
! 		if (!PyInt_Check(v)) {
  			PyErr_SetString(PyExc_TypeError,
  					"slice index must be int");
  			return -1;
  		}
- 		x = PyInt_AsLong(v);
  		/* Truncate -- very long indices are truncated anyway */
  		if (x > INT_MAX)
--- 2536,2577 ----
  	if (v != NULL) {
  		long x;
! 		if (PyInt_Check(v)) {
! 			x = PyInt_AsLong(v);
! 		} else if (PyLong_Check(v)) {
! 			x = PyLong_AsLong(v);
! 			if (x==-1 && PyErr_Occurred()) {
! 				PyObject *long_zero;
! 
! 				if (!PyErr_ExceptionMatches( PyExc_OverflowError ) ) {
! 					/* It's not an overflow error, so just 
! 					   signal an error */
! 					return -1;
! 				}
! 
! 				/* It's an overflow error, so we need to 
! 				   check the sign of the long integer, 
! 				   set the value to INT_MAX or 0, and clear 
! 				   the error. */
! 
! 				/* Create a long integer with a value of 0 */
! 				long_zero = PyLong_FromLong( 0L );
! 				if (long_zero == NULL) return -1;
! 
! 				/* Check sign */
! 				if (PyObject_Compare(long_zero, v) < 0)
! 					x = INT_MAX;
! 				else
! 					x = 0;
! 				
! 				/* Free the long integer we created, and clear the
! 				   OverflowError */
! 				Py_DECREF(long_zero);
! 				PyErr_Clear();
! 			}
! 		} else {
  			PyErr_SetString(PyExc_TypeError,
  					"slice index must be int");
  			return -1;
  		}
  		/* Truncate -- very long indices are truncated anyway */
  		if (x > INT_MAX)



From akuchlin@CNRI.Reston.VA.US  Wed Feb 23 22:21:53 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Wed, 23 Feb 2000 17:21:53 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects abstract.c,2.29,2.30
Message-ID: <200002232221.RAA01146@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory amarok:/home/akuchlin/src/Python-1.5/Objects

Modified Files:
	abstract.c 
Log Message:
Allow using long integers as arguments to PyObject_GetItem(), _SetItem(), 
    and _DelItem().  
In sequence multiplication by a long, only call PyErr_Occurred() when the 
    value returned is -1.


Index: abstract.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/abstract.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** abstract.c	2000/02/14 22:22:04	2.29
--- abstract.c	2000/02/23 22:21:50	2.30
***************
*** 123,126 ****
--- 123,132 ----
  		if (PyInt_Check(key))
  			return PySequence_GetItem(o, PyInt_AsLong(key));
+ 		else if (PyLong_Check(key)) {
+ 			long key_value = PyLong_AsLong(key);
+ 			if (key_value == -1 && PyErr_Occurred())
+ 				return NULL;
+ 			return PySequence_GetItem(o, key_value);
+ 		}
  		return type_error("sequence index must be integer");
  	}
***************
*** 148,151 ****
--- 154,163 ----
  		if (PyInt_Check(key))
  			return PySequence_SetItem(o, PyInt_AsLong(key), value);
+ 		else if (PyLong_Check(key)) {
+ 			long key_value = PyLong_AsLong(key);
+ 			if (key_value == -1 && PyErr_Occurred())
+ 				return -1;
+ 			return PySequence_SetItem(o, key_value, value);
+ 		}
  		type_error("sequence index must be integer");
  		return -1;
***************
*** 174,177 ****
--- 186,195 ----
  		if (PyInt_Check(key))
  			return PySequence_DelItem(o, PyInt_AsLong(key));
+ 		else if (PyLong_Check(key)) {
+ 			long key_value = PyLong_AsLong(key);
+ 			if (key_value == -1 && PyErr_Occurred())
+ 				return -1;
+ 			return PySequence_DelItem(o, key_value);
+ 		}
  		type_error("sequence index must be integer");
  		return -1;
***************
*** 392,396 ****
  		else if (PyLong_Check(w)) {
  			mul_value = PyLong_AsLong(w);
! 			if (PyErr_Occurred())
                                  return NULL; 
  		}
--- 410,414 ----
  		else if (PyLong_Check(w)) {
  			mul_value = PyLong_AsLong(w);
! 			if (mul_value == -1 && PyErr_Occurred())
                                  return NULL; 
  		}



From akuchlin@CNRI.Reston.VA.US  Wed Feb 23 22:23:20 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Wed, 23 Feb 2000 17:23:20 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_types.py,1.12,1.13
Message-ID: <200002232223.RAA01170@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/test
In directory amarok:/home/akuchlin/src/Python-1.5/Lib/test

Modified Files:
	test_types.py 
Log Message:
Add tests to exercise sequence operations (multiplication, indexing,
    slicing) using long integers


Index: test_types.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/test/test_types.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** test_types.py	1998/07/16 15:29:06	1.12
--- test_types.py	2000/02/23 22:23:17	1.13
***************
*** 131,135 ****
--- 131,137 ----
  if [1,2]+[3,4] <> [1,2,3,4]: raise TestFailed, 'list concatenation'
  if [1,2]*3 <> [1,2,1,2,1,2]: raise TestFailed, 'list repetition *3'
+ if [1,2]*3L <> [1,2,1,2,1,2]: raise TestFailed, 'list repetition *3L'
  if 0*[1,2,3] <> []: raise TestFailed, 'list repetition 0*'
+ if 0L*[1,2,3] <> []: raise TestFailed, 'list repetition 0L*'
  if min([1,2]) <> 1 or max([1,2]) <> 2: raise TestFailed, 'min/max list'
  if 0 in [0,1,2] and 1 in [0,1,2] and 2 in [0,1,2] and 3 not in [0,1,2]: pass
***************
*** 151,158 ****
--- 153,167 ----
  print '6.5.3a Additional list operations'
  a = [0,1,2,3,4]
+ a[0L] = 1
+ a[1L] = 2
+ a[2L] = 3
+ if a <> [1,2,3,3,4]: raise TestFailed, 'list item assignment [0L], [1L], [2L]'
  a[0] = 5
  a[1] = 6
  a[2] = 7
  if a <> [5,6,7,3,4]: raise TestFailed, 'list item assignment [0], [1], [2]'
+ a[-2L] = 88
+ a[-1L] = 99
+ if a <> [5,6,7,88,99]: raise TestFailed, 'list item assignment [-2L], [-1L]'
  a[-2] = 8
  a[-1] = 9
***************
*** 162,165 ****
--- 171,176 ----
  a[1:1] = [1,2,3]
  if a <> [0,1,2,3,4]: raise TestFailed, 'list slice assignment'
+ a[ 1L : 4L] = [7,8,9]
+ if a <> [0,7,8,9,4]: raise TestFailed, 'list slice assignment using long ints'
  del a[1:4]
  if a <> [0,4]: raise TestFailed, 'list slice deletion'
***************
*** 168,171 ****
--- 179,189 ----
  del a[-1]
  if a <> []: raise TestFailed, 'list item deletion [-1]'
+ a=range(0,5)
+ del a[1L:4L]
+ if a <> [0,4]: raise TestFailed, 'list slice deletion'
+ del a[0L]
+ if a <> [4]: raise TestFailed, 'list item deletion [0]'
+ del a[-1L]
+ if a <> []: raise TestFailed, 'list item deletion [-1]'
  a.append(0)
  a.append(1)
***************
*** 192,195 ****
--- 210,220 ----
  z = range(12)
  z.sort(myComparison)
+ 
+ # Test extreme cases with long ints
+ a = [0,1,2,3,4]
+ if a[ -pow(2,128L): 3 ] != [0,1,2]: 
+ 	raise TestFailed, "list slicing with too-small long integer"
+ if a[ 3: pow(2,145L) ] != [3,4]: 
+ 	raise TestFailed, "list slicing with too-large long integer"
  
  print '6.6 Mappings == Dictionaries'



From guido@cnri.reston.va.us  Thu Feb 24 02:24:53 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 23 Feb 2000 21:24:53 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib imaplib.py,1.15,1.16
Message-ID: <200002240224.VAA08591@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	imaplib.py 
Log Message:
Piers Lauder:

	A change in my last patch could, under certain circumstances,
	cause a loop if the connection to the server dropped while
	waiting for a command completion. I've changed the code to
	re-raise the error after possible debugging output.


Index: imaplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imaplib.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** imaplib.py	2000/02/17 17:12:39	1.15
--- imaplib.py	2000/02/24 02:24:50	1.16
***************
*** 16,20 ****
  """
  
! __version__ = "2.30"
  
  import binascii, re, socket, string, time, random, sys
--- 16,20 ----
  """
  
! __version__ = "2.32"
  
  import binascii, re, socket, string, time, random, sys
***************
*** 756,762 ****
  
  			# Some have reported "unexpected response" exceptions.
! 			# (Isn't this non-IMAP4-compliant behaviour?
! 			# Please mail me details printed below!)
! 			# Anyway, ignore them here.
  
  			try:
--- 756,762 ----
  
  			# Some have reported "unexpected response" exceptions.
! 			# Note that ignoring them here causes loops.
! 			# Instead, send me details of the unexpected response and
! 			# I'll update the code in `_get_response()'.
  
  			try:
***************
*** 765,770 ****
  				if __debug__:
  					if self.debug >= 1:
- 						_mesg('abort exception ignored: %s' % val)
  						print_log()
  
  
--- 765,770 ----
  				if __debug__:
  					if self.debug >= 1:
  						print_log()
+ 				raise
  
  



From guido@cnri.reston.va.us  Thu Feb 24 02:26:54 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Wed, 23 Feb 2000 21:26:54 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib posixpath.py,1.27,1.28
Message-ID: <200002240226.VAA08616@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	posixpath.py 
Log Message:
Mark Favas discovered this: getatime() accidentally returned the MTIME!
This fixes PR#211.


Index: posixpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/posixpath.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** posixpath.py	2000/02/04 15:10:34	1.27
--- posixpath.py	2000/02/24 02:26:51	1.28
***************
*** 144,148 ****
      """Return the last access time of a file, reported by os.stat()."""
      st = os.stat(filename)
!     return st[stat.ST_MTIME]
  
  
--- 144,148 ----
      """Return the last access time of a file, reported by os.stat()."""
      st = os.stat(filename)
!     return st[stat.ST_ATIME]
  
  



From guido@cnri.reston.va.us  Thu Feb 24 15:01:46 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 24 Feb 2000 10:01:46 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/lib-tk tkSimpleDialog.py,1.4,1.5
Message-ID: <200002241501.KAA09279@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/lib-tk
In directory eric:/projects/python/develop/guido/src/Lib/lib-tk

Modified Files:
	tkSimpleDialog.py 
Log Message:
Moshe Zadka:
Added docstrings to tkSimpleDialog.py


Index: tkSimpleDialog.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/lib-tk/tkSimpleDialog.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** tkSimpleDialog.py	1999/06/25 15:53:54	1.4
--- tkSimpleDialog.py	2000/02/24 15:01:43	1.5
***************
*** 12,15 ****
--- 12,29 ----
  # dialog base class
  
+ '''Dialog boxes
+ 
+ This module handles dialog boxes. It contains the following
+ public symbols:
+ 
+ Dialog -- a base class for dialogs
+ 
+ askinteger -- get an integer from the user
+ 
+ askfloat -- get a float from the user
+ 
+ askstring -- get a string from the user
+ '''
+ 
  from Tkinter import *
  import os
***************
*** 17,22 ****
--- 31,49 ----
  class Dialog(Toplevel):
  
+     '''Class to open dialogs.
+ 
+     This class is intended as a base class for custom dialogs
+     '''
+ 
      def __init__(self, parent, title = None):
  
+         '''Initialize a dialog.
+ 
+         Arguments:
+ 
+             parent -- a parent window (the application window)
+ 
+             title -- the dialog title
+         '''
          Toplevel.__init__(self, parent)
          self.transient(parent)
***************
*** 50,53 ****
--- 77,81 ----
  
      def destroy(self):
+         '''Destroy the window'''
          self.initial_focus = None
          Toplevel.destroy(self)
***************
*** 57,68 ****
  
      def body(self, master):
!         # create dialog body.  return widget that should have
!         # initial focus.  this method should be overridden
  
          pass
  
      def buttonbox(self):
!         # add standard button box. override if you don't want the
!         # standard buttons
          
          box = Frame(self)
--- 85,101 ----
  
      def body(self, master):
!         '''create dialog body.
  
+         return widget that should have initial focus. 
+         This method should be overridden, and is called
+         by the __init__ method.
+         '''
          pass
  
      def buttonbox(self):
!         '''add standard button box. 
! 
!         override if you don't want the standard buttons
!         '''
          
          box = Frame(self)
***************
*** 104,111 ****
--- 137,154 ----
  
      def validate(self):
+         '''validate the data
  
+         This method is called automatically to validate the data before the 
+         dialog is destroyed. By default, it always validates OK.
+         '''
+ 
          return 1 # override
  
      def apply(self):
+         '''process the data
+ 
+         This method is called automatically to process the data, *after*
+         the dialog is destroyed. By default, it does nothing.
+         '''
  
          pass # override
***************
*** 197,200 ****
--- 240,253 ----
  
  def askinteger(title, prompt, **kw):
+     '''get an integer from the user
+ 
+     Arguments:
+ 
+         title -- the dialog title
+         prompt -- the label text
+         **kw -- see SimpleDialog class
+ 
+     Return value is an integer
+     '''
      d = apply(_QueryInteger, (title, prompt), kw)
      return d.result
***************
*** 206,209 ****
--- 259,272 ----
  
  def askfloat(title, prompt, **kw):
+     '''get a float from the user
+ 
+     Arguments:
+ 
+         title -- the dialog title
+         prompt -- the label text
+         **kw -- see SimpleDialog class
+ 
+     Return value is a float
+     '''
      d = apply(_QueryFloat, (title, prompt), kw)
      return d.result
***************
*** 214,217 ****
--- 277,290 ----
  
  def askstring(title, prompt, **kw):
+     '''get a string from the user
+ 
+     Arguments:
+ 
+         title -- the dialog title
+         prompt -- the label text
+         **kw -- see SimpleDialog class
+ 
+     Return value is a string
+     '''
      d = apply(_QueryString, (title, prompt), kw)
      return d.result



From guido@cnri.reston.va.us  Thu Feb 24 15:23:05 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 24 Feb 2000 10:23:05 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects listobject.c,2.63,2.64
Message-ID: <200002241523.KAA09548@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	listobject.c 
Log Message:
Made all list methods use PyArg_ParseTuple(), for more accurate
diagnostics.

*** INCOMPATIBLE CHANGE: This changes append(), remove(), index(), and
*** count() to require exactly one argument -- previously, multiple
*** arguments were silently assumed to be a tuple.


Index: listobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/listobject.c,v
retrieving revision 2.63
retrieving revision 2.64
diff -C2 -r2.63 -r2.64
*** listobject.c	2000/01/20 22:32:54	2.63
--- listobject.c	2000/02/24 15:23:03	2.64
***************
*** 558,562 ****
  	int i;
  	PyObject *v;
! 	if (!PyArg_Parse(args, "(iO)", &i, &v))
  		return NULL;
  	return ins(self, i, v);
--- 558,562 ----
  	int i;
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "iO", &i, &v))
  		return NULL;
  	return ins(self, i, v);
***************
*** 569,573 ****
  {
  	PyObject *v;
! 	if (!PyArg_Parse(args, "O", &v))
  		return NULL;
  	return ins(self, (int) self->ob_size, v);
--- 569,573 ----
  {
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	return ins(self, (int) self->ob_size, v);
***************
*** 1217,1226 ****
  
  static PyObject *
! listsort(self, compare)
  	PyListObject *self;
! 	PyObject *compare;
  {
  	int err;
  
  	self->ob_type = &immutable_list_type;
  	err = samplesortslice(self->ob_item,
--- 1217,1231 ----
  
  static PyObject *
! listsort(self, args)
  	PyListObject *self;
! 	PyObject *args;
  {
  	int err;
+ 	PyObject *compare = NULL;
  
+ 	if (args != NULL) {
+ 		if (!PyArg_ParseTuple(args, "|O", &compare))
+ 			return NULL;
+ 	}
  	self->ob_type = &immutable_list_type;
  	err = samplesortslice(self->ob_item,
***************
*** 1257,1264 ****
  	register PyObject *tmp;
  	
! 	if (args != NULL) {
! 		PyErr_BadArgument();
  		return NULL;
- 	}
  
  	if (self->ob_size > 1) {
--- 1262,1267 ----
  	register PyObject *tmp;
  	
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
  	if (self->ob_size > 1) {
***************
*** 1322,1332 ****
  {
  	int i;
! 	
! 	if (args == NULL) {
! 		PyErr_BadArgument();
  		return NULL;
- 	}
  	for (i = 0; i < self->ob_size; i++) {
! 		if (PyObject_Compare(self->ob_item[i], args) == 0)
  			return PyInt_FromLong((long)i);
  		if (PyErr_Occurred())
--- 1325,1334 ----
  {
  	int i;
! 	PyObject *v;
! 
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
! 		if (PyObject_Compare(self->ob_item[i], v) == 0)
  			return PyInt_FromLong((long)i);
  		if (PyErr_Occurred())
***************
*** 1344,1355 ****
  	int count = 0;
  	int i;
! 	
! 	if (args == NULL) {
! 		PyErr_SetString(PyExc_TypeError,
! 				"list.count(x): argument missing");
  		return NULL;
- 	}
  	for (i = 0; i < self->ob_size; i++) {
! 		if (PyObject_Compare(self->ob_item[i], args) == 0)
  			count++;
  		if (PyErr_Occurred())
--- 1346,1355 ----
  	int count = 0;
  	int i;
! 	PyObject *v;
! 
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
! 		if (PyObject_Compare(self->ob_item[i], v) == 0)
  			count++;
  		if (PyErr_Occurred())
***************
*** 1365,1375 ****
  {
  	int i;
! 	
! 	if (args == NULL) {
! 		PyErr_BadArgument();
  		return NULL;
- 	}
  	for (i = 0; i < self->ob_size; i++) {
! 		if (PyObject_Compare(self->ob_item[i], args) == 0) {
  			if (list_ass_slice(self, i, i+1,
  					   (PyObject *)NULL) != 0)
--- 1365,1374 ----
  {
  	int i;
! 	PyObject *v;
! 
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
! 		if (PyObject_Compare(self->ob_item[i], v) == 0) {
  			if (list_ass_slice(self, i, i+1,
  					   (PyObject *)NULL) != 0)
***************
*** 1405,1417 ****
  
  static PyMethodDef list_methods[] = {
! 	{"append",	(PyCFunction)listappend, 0, append_doc},
! 	{"insert",	(PyCFunction)listinsert, 0, insert_doc},
  	{"extend",      (PyCFunction)listextend, 1, extend_doc},
  	{"pop",		(PyCFunction)listpop, 1, pop_doc},
! 	{"remove",	(PyCFunction)listremove, 0, remove_doc},
! 	{"index",	(PyCFunction)listindex, 0, index_doc},
! 	{"count",	(PyCFunction)listcount, 0, count_doc},
! 	{"reverse",	(PyCFunction)listreverse, 0, reverse_doc},
! 	{"sort",	(PyCFunction)listsort, 0, sort_doc},
  	{NULL,		NULL}		/* sentinel */
  };
--- 1404,1416 ----
  
  static PyMethodDef list_methods[] = {
! 	{"append",	(PyCFunction)listappend, 1, append_doc},
! 	{"insert",	(PyCFunction)listinsert, 1, insert_doc},
  	{"extend",      (PyCFunction)listextend, 1, extend_doc},
  	{"pop",		(PyCFunction)listpop, 1, pop_doc},
! 	{"remove",	(PyCFunction)listremove, 1, remove_doc},
! 	{"index",	(PyCFunction)listindex, 1, index_doc},
! 	{"count",	(PyCFunction)listcount, 1, count_doc},
! 	{"reverse",	(PyCFunction)listreverse, 1, reverse_doc},
! 	{"sort",	(PyCFunction)listsort, 1, sort_doc},
  	{NULL,		NULL}		/* sentinel */
  };



From guido@cnri.reston.va.us  Thu Feb 24 15:26:33 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 24 Feb 2000 10:26:33 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules mpzmodule.c,2.20,2.21
Message-ID: <200002241526.KAA09666@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/src/Modules

Modified Files:
	mpzmodule.c 
Log Message:
Peter Funk:

This patch allows building the Python 'mpzmodule' under SuSE Linux
without having to install the source package of the GMP-libary.
The gmp-mparam.h seems to be an internal header file.  The patch 
shouldn't hurt any other platforms.


Index: mpzmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/mpzmodule.c,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** mpzmodule.c	1998/12/14 19:36:14	2.20
--- mpzmodule.c	2000/02/24 15:26:30	2.21
***************
*** 93,97 ****
--- 93,102 ----
  
  #include "gmp.h"
+ 
+ #if defined __GLIBC__ && __GLIBC__ >= 2 /*aid building on Linux distributions*/
+ #define BITS_PER_MP_LIMB mp_bits_per_limb
+ #else
  #include "gmp-mparam.h"
+ #endif
  
  #if __GNU_MP__ + 0 == 2



From guido@python.org  Thu Feb 24 21:42:12 2000
From: guido@python.org (Guido van Rossum)
Date: Thu, 24 Feb 2000 16:42:12 -0500
Subject: [Python-checkins] CVS: python/dist/src/Objects listobject.c,2.63,2.64
In-Reply-To: Your message of "Thu, 24 Feb 2000 13:20:07 PST."
 <Pine.LNX.4.10.10002241318150.28177-100000@nebula.lyra.org>
References: <Pine.LNX.4.10.10002241318150.28177-100000@nebula.lyra.org>
Message-ID: <200002242142.QAA10559@eric.cnri.reston.va.us>

> On a separate track, how about using the ":Name" form in the ParseTuple
> calls? It improves the error response a bit more...
> 
> Is that something you'd want to see in all the ParseTuple calls?

Ah, darn.  I tried ";message" but it's inferior; I'd forgotten about
":name".  Yes, that should be standard...  Patches, please?

--Guido van Rossum (home page: http://www.python.org/~guido/)


From guido@cnri.reston.va.us  Thu Feb 24 21:48:32 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Thu, 24 Feb 2000 16:48:32 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects listobject.c,2.64,2.65
Message-ID: <200002242148.QAA10690@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	listobject.c 
Log Message:
OKOK, Greg's right, I should've used the :name option in the argument
format strings.


Index: listobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/listobject.c,v
retrieving revision 2.64
retrieving revision 2.65
diff -C2 -r2.64 -r2.65
*** listobject.c	2000/02/24 15:23:03	2.64
--- listobject.c	2000/02/24 21:48:29	2.65
***************
*** 558,562 ****
  	int i;
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "iO", &i, &v))
  		return NULL;
  	return ins(self, i, v);
--- 558,562 ----
  	int i;
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "iO:insert", &i, &v))
  		return NULL;
  	return ins(self, i, v);
***************
*** 569,573 ****
  {
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	return ins(self, (int) self->ob_size, v);
--- 569,573 ----
  {
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "O:append", &v))
  		return NULL;
  	return ins(self, (int) self->ob_size, v);
***************
*** 585,589 ****
  	register int i;
  
! 	if (!PyArg_ParseTuple(args, "O", &b))
  		return NULL;
  
--- 585,589 ----
  	register int i;
  
! 	if (!PyArg_ParseTuple(args, "O:extend", &b))
  		return NULL;
  
***************
*** 652,656 ****
  	int i = -1;
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "|i", &i))
  		return NULL;
  	if (self->ob_size == 0) {
--- 652,656 ----
  	int i = -1;
  	PyObject *v;
! 	if (!PyArg_ParseTuple(args, "|i:pop", &i))
  		return NULL;
  	if (self->ob_size == 0) {
***************
*** 1225,1229 ****
  
  	if (args != NULL) {
! 		if (!PyArg_ParseTuple(args, "|O", &compare))
  			return NULL;
  	}
--- 1225,1229 ----
  
  	if (args != NULL) {
! 		if (!PyArg_ParseTuple(args, "|O:sort", &compare))
  			return NULL;
  	}
***************
*** 1262,1266 ****
  	register PyObject *tmp;
  	
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 1262,1266 ----
  	register PyObject *tmp;
  	
! 	if (!PyArg_ParseTuple(args, ":reverse"))
  		return NULL;
  
***************
*** 1327,1331 ****
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
--- 1327,1331 ----
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O:index", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
***************
*** 1348,1352 ****
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
--- 1348,1352 ----
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O:count", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
***************
*** 1367,1371 ****
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {
--- 1367,1371 ----
  	PyObject *v;
  
! 	if (!PyArg_ParseTuple(args, "O:remove", &v))
  		return NULL;
  	for (i = 0; i < self->ob_size; i++) {



From guido@cnri.reston.va.us  Fri Feb 25 11:44:06 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 06:44:06 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib cgi.py,1.45,1.46
Message-ID: <200002251144.GAA14998@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	cgi.py 
Log Message:
Fix a broken r.append(name, value) call, spotted by Tim.


Index: cgi.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/cgi.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** cgi.py	1999/06/11 18:26:09	1.45
--- cgi.py	2000/02/25 11:44:03	1.46
***************
*** 601,605 ****
          name = urllib.unquote(string.replace(nv[0], '+', ' '))
          value = urllib.unquote(string.replace(nv[1], '+', ' '))
!         r.append(name, value)
  
      return r
--- 601,605 ----
          name = urllib.unquote(string.replace(nv[0], '+', ' '))
          value = urllib.unquote(string.replace(nv[1], '+', ' '))
!         r.append((name, value))
  
      return r



From guido@cnri.reston.va.us  Fri Feb 25 11:46:53 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 06:46:53 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Demo/sgi/gl nurbs.py,1.3,1.4
Message-ID: <200002251146.GAA15023@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Demo/sgi/gl
In directory eric:/projects/python/develop/guido/src/Demo/sgi/gl

Modified Files:
	nurbs.py 
Log Message:
Fix a couple dozen broken ci.append(x, y, z) calls, spotted by Tim.


Index: nurbs.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Demo/sgi/gl/nurbs.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** nurbs.py	1996/11/27 19:49:54	1.3
--- nurbs.py	2000/02/25 11:46:50	1.4
***************
*** 24,52 ****
  	#
  	ci = []
! 	ci.append(-2.5,  -3.7,  1.0)
! 	ci.append(-1.5,  -3.7,  3.0)
! 	ci.append(1.5,  -3.7, -2.5)
! 	ci.append(2.5,  -3.7,  -0.75)
  	c.append(ci)
  	#
  	ci = []
! 	ci.append(-2.5,  -2.0,  3.0)
! 	ci.append(-1.5,  -2.0,  4.0)
! 	ci.append(1.5,  -2.0,  -3.0)
! 	ci.append(2.5,  -2.0,  0.0)
  	c.append(ci)
  	#
  	ci = []
! 	ci.append(-2.5, 2.0,  1.0)
! 	ci.append(-1.5, 2.0,  0.0)
! 	ci.append(1.5,  2.0,  -1.0)
! 	ci.append(2.5,  2.0,  2.0)
  	c.append(ci)
  	#
  	ci = []
! 	ci.append(-2.5,  2.7,  1.25)
! 	ci.append(-1.5,  2.7,  0.1)
! 	ci.append(1.5,  2.7,  -0.6)
! 	ci.append(2.5,  2.7,  0.2)
  	c.append(ci)
  	#
--- 24,52 ----
  	#
  	ci = []
! 	ci.append((-2.5,  -3.7,  1.0))
! 	ci.append((-1.5,  -3.7,  3.0))
! 	ci.append((1.5,  -3.7, -2.5))
! 	ci.append((2.5,  -3.7,  -0.75))
  	c.append(ci)
  	#
  	ci = []
! 	ci.append((-2.5,  -2.0,  3.0))
! 	ci.append((-1.5,  -2.0,  4.0))
! 	ci.append((1.5,  -2.0,  -3.0))
! 	ci.append((2.5,  -2.0,  0.0))
  	c.append(ci)
  	#
  	ci = []
! 	ci.append((-2.5, 2.0,  1.0))
! 	ci.append((-1.5, 2.0,  0.0))
! 	ci.append((1.5,  2.0,  -1.0))
! 	ci.append((2.5,  2.0,  2.0))
  	c.append(ci)
  	#
  	ci = []
! 	ci.append((-2.5,  2.7,  1.25))
! 	ci.append((-1.5,  2.7,  0.1))
! 	ci.append((1.5,  2.7,  -0.6))
! 	ci.append((2.5,  2.7,  0.2))
  	c.append(ci)
  	#
***************
*** 59,71 ****
  def make_trimpoints():
  	c = []
! 	c.append(1.0, 0.0, 1.0)
! 	c.append(1.0, 1.0, 1.0)
! 	c.append(0.0, 2.0, 2.0)
! 	c.append(-1.0, 1.0, 1.0)
! 	c.append(-1.0, 0.0, 1.0)
! 	c.append(-1.0, -1.0, 1.0)
! 	c.append(0.0, -2.0, 2.0)
! 	c.append(1.0, -1.0, 1.0) 
! 	c.append(1.0, 0.0, 1.0)
  	return c
  
--- 59,71 ----
  def make_trimpoints():
  	c = []
! 	c.append((1.0, 0.0, 1.0))
! 	c.append((1.0, 1.0, 1.0))
! 	c.append((0.0, 2.0, 2.0))
! 	c.append((-1.0, 1.0, 1.0))
! 	c.append((-1.0, 0.0, 1.0))
! 	c.append((-1.0, -1.0, 1.0))
! 	c.append((0.0, -2.0, 2.0))
! 	c.append((1.0, -1.0, 1.0) )
! 	c.append((1.0, 0.0, 1.0))
  	return c
  



From guido@cnri.reston.va.us  Fri Feb 25 11:48:45 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 06:48:45 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib asyncore.py,1.4,1.5
Message-ID: <200002251148.GAA15045@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	asyncore.py 
Log Message:
Fix a couple broken append() calls, spotted by Tim.


Index: asyncore.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/asyncore.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** asyncore.py	2000/02/04 15:39:29	1.4
--- asyncore.py	2000/02/25 11:48:42	1.5
***************
*** 103,107 ****
  				flags = flags | poll.POLLOUT
  			if flags:
! 				l.append (fd, flags)
  		r = poll.poll (l, timeout)
  		for fd, flags in r:
--- 103,107 ----
  				flags = flags | poll.POLLOUT
  			if flags:
! 				l.append ((fd, flags))
  		r = poll.poll (l, timeout)
  		for fd, flags in r:
***************
*** 395,403 ****
  	tbinfo = []
  	while 1:
! 		tbinfo.append (
  			tb.tb_frame.f_code.co_filename,
! 			tb.tb_frame.f_code.co_name,				
  			str(tb.tb_lineno)
! 			)
  		tb = tb.tb_next
  		if not tb:
--- 395,403 ----
  	tbinfo = []
  	while 1:
! 		tbinfo.append ((
  			tb.tb_frame.f_code.co_filename,
! 			tb.tb_frame.f_code.co_name,
  			str(tb.tb_lineno)
! 			))
  		tb = tb.tb_next
  		if not tb:



From fdrake@weyr.cnri.reston.va.us  Fri Feb 25 16:14:10 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Fri, 25 Feb 2000 11:14:10 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib getopt.py,1.9,1.10
Message-ID: <200002251614.LAA19469@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	getopt.py 
Log Message:

Gerrit Holl's patch to move attribution from the docstring to a
comment.  <gerrit@nl.linux.org>


Index: getopt.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/getopt.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** getopt.py	2000/02/04 15:39:29	1.9
--- getopt.py	2000/02/25 16:14:08	1.10
***************
*** 8,14 ****
  provides a single function and an exception:
  
- Gerrit Holl <gerrit@nl.linux.org> moved the string-based exceptions
- to class-based exceptions.
- 
  getopt() -- Parse command line options
  GetoptError -- exception (class) raised with 'opt' attribute, which is the
--- 8,11 ----
***************
*** 18,21 ****
--- 15,21 ----
  # Long option support added by Lars Wirzenius <liw@iki.fi>.
  
+ # Gerrit Holl <gerrit@nl.linux.org> moved the string-based exceptions
+ # to class-based exceptions.
+ 
  import string
  
***************
*** 82,86 ****
  def do_longs(opts, opt, longopts, args):
      try:
!         i = string.index(opt, '=')
          opt, optarg = opt[:i], opt[i+1:]
      except ValueError:
--- 82,86 ----
  def do_longs(opts, opt, longopts, args):
      try:
!         i = opt.index('=')
          opt, optarg = opt[:i], opt[i+1:]
      except ValueError:



From guido@cnri.reston.va.us  Fri Feb 25 16:34:13 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 11:34:13 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib getopt.py,1.10,1.11
Message-ID: <200002251634.LAA16476@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	getopt.py 
Log Message:
Gerrit forgot to remove the "import string".


Index: getopt.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/getopt.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** getopt.py	2000/02/25 16:14:08	1.10
--- getopt.py	2000/02/25 16:34:11	1.11
***************
*** 18,23 ****
  # to class-based exceptions.
  
- import string
- 
  class GetoptError(Exception):
      opt = ''
--- 18,21 ----



From guido@cnri.reston.va.us  Fri Feb 25 17:51:02 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 12:51:02 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules posixmodule.c,2.123,2.124
Message-ID: <200002251751.MAA19391@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/src/Modules

Modified Files:
	posixmodule.c 
Log Message:
Delete references to _SC_AIO_LIST_MAX; it appears that that symbol was
just a typo in some Linux header; the real symbol is
_SC_AIO_LISTIO_MAX.


Index: posixmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/posixmodule.c,v
retrieving revision 2.123
retrieving revision 2.124
diff -C2 -r2.123 -r2.124
*** posixmodule.c	2000/01/31 18:41:26	2.123
--- posixmodule.c	2000/02/25 17:51:00	2.124
***************
*** 3786,3792 ****
      {"SC_AIO_LISTIO_MAX",	_SC_AIO_LISTIO_MAX},
  #endif
- #ifdef _SC_AIO_LIST_MAX
-     {"SC_AIO_LIST_MAX",	_SC_AIO_LIST_MAX},
- #endif
  #ifdef _SC_AIO_MAX
      {"SC_AIO_MAX",	_SC_AIO_MAX},
--- 3786,3789 ----



From guido@cnri.reston.va.us  Fri Feb 25 19:25:07 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 14:25:07 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/test/output test_fork1,NONE,1.1
Message-ID: <200002251925.OAA19984@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/test/output
In directory eric:/projects/python/develop/guido/src/Lib/test/output

Added Files:
	test_fork1 
Log Message:
Test case for fork1() behavior.
Only the main thread should survive in the child after a fork().





From guido@cnri.reston.va.us  Fri Feb 25 19:25:31 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 14:25:31 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/test test_fork1.py,NONE,1.1
Message-ID: <200002251925.OAA19995@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/test
In directory eric:/projects/python/develop/guido/src/Lib/test

Added Files:
	test_fork1.py 
Log Message:
Test case for fork1() behavior.
Only the main thread should survive in the child after a fork().





From guido@cnri.reston.va.us  Fri Feb 25 19:26:34 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Fri, 25 Feb 2000 14:26:34 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src configure,1.107,1.108 configure.in,1.115,1.116
Message-ID: <200002251926.OAA20017@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src
In directory eric:/projects/python/develop/guido/src

Modified Files:
	configure configure.in 
Log Message:
Pat Knight:

Solaris 2 has stub implementations of the POSIX thread functions such as 
pthread_detach in libc. This means that configure tries to use them without 
-lpthread, then the test of pthread_create fails and the configuration 
falls back to the Solaris thread library. This patch moves the test for 
pthread_create in -lpthread ahead of the test for pthread_detach in libc. 
The patch also ensures that -lpthread is at the start of the library list 
when linking, to pick up POSIX thread semantics for fork (see below).

Justification.
Use of POSIX threads on Solaris ensures that the fork() call only runs the 
thread that called fork() in the child. This is desirable to prevent (for 
example) parent server or database threads running in the child. Sun's 
-lthread library uses a traditional fork() which replicates all the 
parent's threads in the child. I find this undesirable.

Digression.
The configure.in seems to always test for -lthread even if a POSIX library 
is found. I'm not enough of a configure.in wizard to decide whether this is 
desirable or how to fix it. It is also irrelevant to this patch - I just 
spotted it while testing.
End of Digression.



Index: configure
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -r1.107 -r1.108
*** configure	2000/02/03 13:50:24	1.107
--- configure	2000/02/25 19:26:30	1.108
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in Revision: 1.115 
  
  # Guess values for system-dependent variables and create Makefiles.
--- 1,5 ----
  #! /bin/sh
  
! # From configure.in Revision: 1.116 
  
  # Guess values for system-dependent variables and create Makefiles.
***************
*** 2733,2743 ****
    echo "$ac_t""no" 1>&6
  
  echo $ac_n "checking for pthread_detach""... $ac_c" 1>&6
! echo "configure:2737: checking for pthread_detach" >&5
  if eval "test \"`echo '$''{'ac_cv_func_pthread_detach'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2742 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 2733,2791 ----
    echo "$ac_t""no" 1>&6
  
+ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+ echo "configure:2737: checking for pthread_create in -lpthread" >&5
+ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthread  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 2745 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+ char pthread_create();
+ 
+ int main() {
+ pthread_create()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+ rm -f conftest*
+ LIBS="$ac_save_LIBS"
+ 
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   cat >> confdefs.h <<\EOF
+ #define WITH_THREAD 1
+ EOF
+ 
+ cat >> confdefs.h <<\EOF
+ #define _POSIX_THREADS 1
+ EOF
+ 
+ LIBS="-lpthread $LIBS"
+ LIBOBJS="$LIBOBJS thread.o"
+ else
+   echo "$ac_t""no" 1>&6
+ 
  echo $ac_n "checking for pthread_detach""... $ac_c" 1>&6
! echo "configure:2785: checking for pthread_detach" >&5
  if eval "test \"`echo '$''{'ac_cv_func_pthread_detach'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2790 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 2762,2766 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_pthread_detach=yes"
--- 2810,2814 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_pthread_detach=yes"
***************
*** 2790,2804 ****
  ac_safe=`echo "kernel/OS.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for kernel/OS.h""... $ac_c" 1>&6
! echo "configure:2793: checking for kernel/OS.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2798 "configure"
  #include "confdefs.h"
  #include <kernel/OS.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 2838,2852 ----
  ac_safe=`echo "kernel/OS.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for kernel/OS.h""... $ac_c" 1>&6
! echo "configure:2841: checking for kernel/OS.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2846 "configure"
  #include "confdefs.h"
  #include <kernel/OS.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 2829,2833 ****
  
  echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
! echo "configure:2832: checking for pthread_create in -lpthreads" >&5
  ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 2877,2881 ----
  
  echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
! echo "configure:2880: checking for pthread_create in -lpthreads" >&5
  ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 2837,2888 ****
  LIBS="-lpthreads  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2840 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
- char pthread_create();
- 
- int main() {
- pthread_create()
- ; return 0; }
- EOF
- if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=no"
- fi
- rm -f conftest*
- LIBS="$ac_save_LIBS"
- 
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   cat >> confdefs.h <<\EOF
- #define WITH_THREAD 1
- EOF
- 
- cat >> confdefs.h <<\EOF
- #define _POSIX_THREADS 1
- EOF
- 
- LIBS="$LIBS -lpthreads"
- LIBOBJS="$LIBOBJS thread.o"
- else
-   echo "$ac_t""no" 1>&6
- 
- echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
- echo "configure:2880: checking for pthread_create in -lpthread" >&5
- ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-lpthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
  #line 2888 "configure"
  #include "confdefs.h"
--- 2885,2888 ----
***************
*** 2919,2923 ****
  EOF
  
! LIBS="$LIBS -lpthread"
  LIBOBJS="$LIBOBJS thread.o"
  else
--- 2919,2923 ----
  EOF
  
! LIBS="$LIBS -lpthreads"
  LIBOBJS="$LIBOBJS thread.o"
  else

Index: configure.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/configure.in,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -r1.115 -r1.116
*** configure.in	2000/02/03 13:42:50	1.115
--- configure.in	2000/02/25 19:26:31	1.116
***************
*** 1,4 ****
  dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.115 $)
  AC_PREREQ(2.0)
  AC_INIT(Include/object.h)
--- 1,4 ----
  dnl Process this file with autoconf 2.0 or later to make a configure script.
! AC_REVISION($Revision: 1.116 $)
  AC_PREREQ(2.0)
  AC_INIT(Include/object.h)
***************
*** 648,651 ****
--- 648,655 ----
  AC_DEFINE(C_THREADS)
  LIBOBJS="$LIBOBJS thread.o"],[
+ AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
+ AC_DEFINE(_POSIX_THREADS)
+ LIBS="-lpthread $LIBS"
+ LIBOBJS="$LIBOBJS thread.o"],[
  AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD)
  AC_DEFINE(_POSIX_THREADS)
***************
*** 657,664 ****
  AC_DEFINE(_POSIX_THREADS)
  LIBS="$LIBS -lpthreads"
- LIBOBJS="$LIBOBJS thread.o"], [
- AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD)
- AC_DEFINE(_POSIX_THREADS)
- LIBS="$LIBS -lpthread"
  LIBOBJS="$LIBOBJS thread.o"], [
  AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD)
--- 661,664 ----



From bwarsaw@cnri.reston.va.us  Fri Feb 25 21:54:21 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw)
Date: Fri, 25 Feb 2000 16:54:21 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/lib-tk Tkinter.py,1.134,1.135
Message-ID: <200002252154.QAA00827@anthem.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/lib-tk
In directory anthem:/home/bwarsaw/projects/python/Lib/lib-tk

Modified Files:
	Tkinter.py 
Log Message:
Changes inspired by Randall Hooper to allow callbacks when an
OptionMenu is modified.  Somewhat rewritten and elaborated by myself.

class _setit: The constructor now takes an optional argument
`callback' and stashes this in a private variable.  If set, the
__call__() method will invoke this callback after the variable's value
has changed.  It will pass the callback the value, followed by any
args passed to __call__().

class OptionMenu: The constructor now takes keyword arguments, the
only one that's legally recognized is `command', which can be set to a
callback.  This callback is invoked when the OptionMenu value is set.
Any other keyword argument throws a TclError.


Index: Tkinter.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/lib-tk/Tkinter.py,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -r1.134 -r1.135
*** Tkinter.py	1999/10/20 12:29:56	1.134
--- Tkinter.py	2000/02/25 21:54:19	1.135
***************
*** 1,5 ****
  # Tkinter.py -- Tk/Tcl widget wrappers
  
! __version__ = "$Revision: 1.134 $"
  
  import sys
--- 1,5 ----
  # Tkinter.py -- Tk/Tcl widget wrappers
  
! __version__ = "$Revision: 1.135 $"
  
  import sys
***************
*** 1791,1802 ****
  
  class _setit:
! 	def __init__(self, var, value):
  		self.__value = value
  		self.__var = var
  	def __call__(self, *args):
  		self.__var.set(self.__value)
  
  class OptionMenu(Menubutton):
! 	def __init__(self, master, variable, value, *values):
  		kw = {"borderwidth": 2, "textvariable": variable,
  		      "indicatoron": 1, "relief": RAISED, "anchor": "c",
--- 1791,1805 ----
  
  class _setit:
! 	def __init__(self, var, value, callback=None):
  		self.__value = value
  		self.__var = var
+ 		self.__callback = callback
  	def __call__(self, *args):
  		self.__var.set(self.__value)
+ 		if self.__callback:
+ 			apply(self.__callback, (self.__value,)+args)
  
  class OptionMenu(Menubutton):
! 	def __init__(self, master, variable, value, *values, **kwargs):
  		kw = {"borderwidth": 2, "textvariable": variable,
  		      "indicatoron": 1, "relief": RAISED, "anchor": "c",
***************
*** 1806,1812 ****
  		menu = self.__menu = Menu(self, name="menu", tearoff=0)
  		self.menuname = menu._w
! 		menu.add_command(label=value, command=_setit(variable, value))
  		for v in values:
! 			menu.add_command(label=v, command=_setit(variable, v))
  		self["menu"] = menu
  
--- 1809,1823 ----
  		menu = self.__menu = Menu(self, name="menu", tearoff=0)
  		self.menuname = menu._w
! 		# 'command' is the only supported keyword
! 		callback = kwargs.get('command')
! 		if kwargs.has_key('command')
! 			del kwargs['command']
! 		if kwargs:
! 			raise TclError, 'unknown option -'+kwargs.keys()[0]
! 		menu.add_command(label=value,
! 				 command=_setit(variable, value, callback))
  		for v in values:
! 			menu.add_command(label=v,
! 					 command=_setit(variable, v, callback))
  		self["menu"] = menu
  



From akuchlin@CNRI.Reston.VA.US  Fri Feb 25 22:23:34 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Fri, 25 Feb 2000 17:23:34 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules mpzmodule.c,2.21,2.22
Message-ID: <200002252223.RAA15673@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory amarok:/home/akuchlin/src/Python-1.5/Modules

Modified Files:
	mpzmodule.c 
Log Message:
Better fix for mpzmodule problem reported by Peter Funk: just use
    mp_bits_per_limb with GMP 2.0


Index: mpzmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/mpzmodule.c,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -r2.21 -r2.22
*** mpzmodule.c	2000/02/24 15:26:30	2.21
--- mpzmodule.c	2000/02/25 22:23:31	2.22
***************
*** 94,107 ****
  #include "gmp.h"
  
- #if defined __GLIBC__ && __GLIBC__ >= 2 /*aid building on Linux distributions*/
- #define BITS_PER_MP_LIMB mp_bits_per_limb
- #else
- #include "gmp-mparam.h"
- #endif
- 
  #if __GNU_MP__ + 0 == 2
  #define GMP2
  #else
  #define MPZ_GET_STR_BUG
  #endif
  
--- 94,103 ----
  #include "gmp.h"
  
  #if __GNU_MP__ + 0 == 2
  #define GMP2
+ #define BITS_PER_MP_LIMB mp_bits_per_limb
  #else
  #define MPZ_GET_STR_BUG
+ #include "gmp-mparam.h"
  #endif
  



From bwarsaw@cnri.reston.va.us  Sat Feb 26 20:56:50 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw)
Date: Sat, 26 Feb 2000 15:56:50 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/i18n pygettext.py,1.5,1.6
Message-ID: <200002262056.PAA28644@anthem.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/i18n
In directory anthem:/home/bwarsaw/projects/python/Tools/i18n

Modified Files:
	pygettext.py 
Log Message:
Changes submitted by Peter Funk (some fixes/additions by B.Warsaw) to
make pygettext more compatible with GNU xgettext, specifically:

Added -E/--escape for allowing pass-thru of iso8859-1 characters above
7 bits.

Added -o/--output option for renaming the output file from
messages.pot (there's overlap with -d/--default-domain, but GNU
xgettext has them both).

Added -p/--output-dir for specifying the output directory for
messages.pot.

Added -V/--version for printing the version number.

Added -w/--width for specifying the output page width (this is because
now pygettext, like GNU xgettext will put several locations on the
same line to cut down on vertical space).

Added -x/--exclude-file for specifying a list of strings that are not
to be extracted from the input files.

Bumped version number to 1.0

Try to import fintl and use fintl.gettext as _ if available.  Fall
back is to use identity definition of _().

Moved the escape creation to a function make_escapes() so that its
behavior can be controlled by the -E option.

__openseen(): Support the -x option.

write(): Support -w option and vertical space preserving feature.

main(): Support new options.


Index: pygettext.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/i18n/pygettext.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** pygettext.py	1999/12/06 02:46:49	1.5
--- pygettext.py	2000/02/26 20:56:47	1.6
***************
*** 1,4 ****
--- 1,7 ----
  #! /usr/bin/env python
  # Originally written by Barry Warsaw <bwarsaw@python.org>
+ #
+ # minimally patched to make it even more xgettext compatible 
+ # by Peter Funk <pf@artcom-gmbh.de>
  
  """pygettext -- Python equivalent of xgettext(1)
***************
*** 36,40 ****
  
  NOTE: pygettext attempts to be option and feature compatible with GNU xgettext
! where ever possible.
  
  Usage: pygettext [options] filename ...
--- 39,44 ----
  
  NOTE: pygettext attempts to be option and feature compatible with GNU xgettext
! where ever possible.  However some options are still missing or are not fully
! implemented.
  
  Usage: pygettext [options] filename ...
***************
*** 45,52 ****
      --extract-all
          Extract all strings
  
!     -d default-domain
!     --default-domain=default-domain
!         Rename the default output file from messages.pot to default-domain.pot 
  
      -k [word]
--- 49,64 ----
      --extract-all
          Extract all strings
+ 
+     -d name
+     --default-domain=name
+         Rename the default output file from messages.pot to name.pot 
+ 
+     -E
+     --escape
+         replace non-ASCII characters with octal escape sequences.
  
!     -h
!     --help
!         print this help message and exit
  
      -k [word]
***************
*** 74,84 ****
          insensitive.  By default, locations are included.
  
      -v
      --verbose
          Print the names of the files being processed.
  
!     --help
!     -h
!         print this help message and exit
  
  """
--- 86,114 ----
          insensitive.  By default, locations are included.
  
+     -o filename
+     --output=filename
+         Rename the default output file from messages.pot to filename.
+ 
+     -p dir
+     --output-dir=dir
+         Output files will be placed in directory dir.
+ 
      -v
      --verbose
          Print the names of the files being processed.
  
!     -V
!     --version
!         Print the version of pygettext and exit.
! 
!     -w columns
!     --width=columns
!         Set width of output to columns.
! 
!     -x filename
!     --exclude-file=filename
!         Specify a file that contains a list of strings that are not be
!         extracted from the input files.  Each string to be excluded must
!         appear on a line by itself in the file.
  
  """
***************
*** 91,100 ****
  import tokenize
  
! __version__ = '0.2'
  
  
  
  # for selftesting
! def _(s): return s
  
  
--- 121,134 ----
  import tokenize
  
! __version__ = '1.0'
  
  
  
  # for selftesting
! try:
!     import fintl
!     _ = fintl.gettext
! except ImportError:
!     def _(s): return s
  
  
***************
*** 126,144 ****
      sys.exit(code)
  
  
  escapes = []
- for i in range(256):
-     if i < 32 or i > 127:
-         escapes.append("\\%03o" % i)
-     else:
-         escapes.append(chr(i))
  
! escapes[ord('\\')] = '\\\\'
! escapes[ord('\t')] = '\\t'
! escapes[ord('\r')] = '\\r'
! escapes[ord('\n')] = '\\n'
! escapes[ord('\"')] = '\\"'
  
  def escape(s):
      s = list(s)
      for i in range(len(s)):
--- 160,188 ----
      sys.exit(code)
  
+ 
  
  escapes = []
  
! def make_escapes(pass_iso8859):
!     global escapes
!     for i in range(256):
!         if pass_iso8859:
!             # Allow iso-8859 characters to pass through so that e.g. 'msgid
!             # "Höhe"' would result not result in 'msgid "H\366he"'.  Otherwise
!             # we escape any character outside the 32..126 range.
!             i = i % 128
!         if 32 <= i <= 126:
!             escapes.append(chr(i))
!         else:
!             escapes.append("\\%03o" % i)
!     escapes[ord('\\')] = '\\\\'
!     escapes[ord('\t')] = '\\t'
!     escapes[ord('\r')] = '\\r'
!     escapes[ord('\n')] = '\\n'
!     escapes[ord('\"')] = '\\"'
  
+ 
  def escape(s):
+     global escapes
      s = list(s)
      for i in range(len(s)):
***************
*** 201,210 ****
              if self.__data:
                  msg = string.join(self.__data, '')
!                 entry = (self.__curfile, self.__lineno)
!                 linenos = self.__messages.get(msg)
!                 if linenos is None:
!                     self.__messages[msg] = [entry]
!                 else:
!                     linenos.append(entry)
              self.__state = self.__waiting
          elif ttype == tokenize.STRING:
--- 245,255 ----
              if self.__data:
                  msg = string.join(self.__data, '')
!                 if not msg in self.__options.toexclude:
!                     entry = (self.__curfile, self.__lineno)
!                     linenos = self.__messages.get(msg)
!                     if linenos is None:
!                         self.__messages[msg] = [entry]
!                     else:
!                         linenos.append(entry)
              self.__state = self.__waiting
          elif ttype == tokenize.STRING:
***************
*** 223,240 ****
              # The time stamp in the header doesn't have the same format
              # as that generated by xgettext...
!             print pot_header % {'time': timestamp, 'version':__version__}
              for k, v in self.__messages.items():
!                 for filename, lineno in v:
!                     # location comments are different b/w Solaris and GNU
!                     d = {'filename': filename,
!                          'lineno': lineno}
!                     if options.location == options.SOLARIS:
                          print _('# File: %(filename)s, line: %(lineno)d') % d
!                     elif options.location == options.GNU:
!                         print _('#: %(filename)s:%(lineno)d') % d
                  # TBD: sorting, normalizing
                  print 'msgid', normalize(k)
!                 print 'msgstr ""'
!                 print
          finally:
              sys.stdout = sys.__stdout__
--- 268,295 ----
              # The time stamp in the header doesn't have the same format
              # as that generated by xgettext...
!             print pot_header % {'time': timestamp, 'version': __version__}
              for k, v in self.__messages.items():
!                 # location comments are different b/w Solaris and GNU:
!                 if options.location == options.SOLARIS:
!                     for filename, lineno in v:
!                         d = {'filename': filename, 'lineno': lineno}
                          print _('# File: %(filename)s, line: %(lineno)d') % d
!                 elif options.location == options.GNU:
!                     # fit as many locations on one line, as long as the
!                     # resulting line length doesn't exceeds 'options.width'
!                     locline = '#:'
!                     for filename, lineno in v:
!                         d = {'filename': filename, 'lineno': lineno}
!                         s = _(' %(filename)s:%(lineno)d') % d
!                         if len(locline) + len(s) <= options.width:
!                             locline = locline + s
!                         else:
!                             print locline
!                             locline = "#:" + s
!                     if len(locline) > 2:
!                         print locline
                  # TBD: sorting, normalizing
                  print 'msgid', normalize(k)
!                 print 'msgstr ""\n'
          finally:
              sys.stdout = sys.__stdout__
***************
*** 246,252 ****
          opts, args = getopt.getopt(
              sys.argv[1:],
!             'k:d:n:hv',
!             ['keyword', 'default-domain', 'help',
!              'add-location=', 'no-location', 'verbose'])
      except getopt.error, msg:
          usage(1, msg)
--- 301,309 ----
          opts, args = getopt.getopt(
              sys.argv[1:],
!             'ad:Ehk:n:o:p:Vvw:x:',
!             ['extract-all', 'default-domain', 'escape', 'help', 'keyword',
!              'add-location', 'no-location', 'output=', 'output-dir=',
!              'verbose', 'version', 'width=', 'exclude-file=',
!              ])
      except getopt.error, msg:
          usage(1, msg)
***************
*** 258,265 ****
--- 315,327 ----
          SOLARIS = 2
          # defaults
+         extractall = 0 # FIXME: currently this option has no effect at all.
+         escape = 0
          keywords = []
+         outpath = ''
          outfile = 'messages.pot'
          location = GNU
          verbose = 0
+         width = 78
+         excludefilename = ''
  
      options = Options()
***************
*** 272,281 ****
          if opt in ('-h', '--help'):
              usage(0)
          elif opt in ('-k', '--keyword'):
              if arg is None:
                  default_keywords = []
              options.keywords.append(arg)
-         elif opt in ('-d', '--default-domain'):
-             options.outfile = arg + '.pot'
          elif opt in ('-n', '--add-location'):
              if arg is None:
--- 334,347 ----
          if opt in ('-h', '--help'):
              usage(0)
+         elif opt in ('-a', '--extract-all'):
+             options.extractall = 1
+         elif opt in ('-d', '--default-domain'):
+             options.outfile = arg + '.pot'
+         elif opt in ('-E', '--escape'):
+             options.escape = 1
          elif opt in ('-k', '--keyword'):
              if arg is None:
                  default_keywords = []
              options.keywords.append(arg)
          elif opt in ('-n', '--add-location'):
              if arg is None:
***************
*** 288,297 ****
--- 354,395 ----
          elif opt in ('--no-location',):
              options.location = 0
+         elif opt in ('-o', '--output'):
+             options.outfile = arg
+         elif opt in ('-p', '--output-dir'):
+             options.outpath = arg
          elif opt in ('-v', '--verbose'):
              options.verbose = 1
+         elif opt in ('-V', '--version'):
+             print _('pygettext.py (xgettext for Python) %s') % __version__
+             sys.exit(0)
+         elif opt in ('-w', '--width'):
+             try:
+                 options.width = int(arg)
+             except ValueError:
+                 d = {'arg':arg}
+                 usage(1, _('Invalid value for --width: %(arg)s, must be int')
+                       % d)
+         elif opt in ('-x', '--exclude-file'):
+             options.excludefilename = arg
+ 
+     # calculate escapes
+     make_escapes(options.escapes)
  
      # calculate all keywords
      options.keywords.extend(default_keywords)
  
+     # initialize list of strings to exclude
+     if options.excludefilename:
+         try:
+             fp = open(options.excludefilename)
+             options.toexclude = fp.readlines()
+             fp.close()
+         except IOError:
+             sys.stderr.write(_("Can't read --exclude-file: %s") %
+                              options.excludefilename)
+             sys.exit(1)
+     else:
+         options.toexclude = []
+ 
      # slurp through all the files
      eater = TokenEater(options)
***************
*** 304,307 ****
--- 402,407 ----
          fp.close()
  
+     if options.outpath:
+         options.outfile = os.path.join(options.outpath, options.outfile)
      fp = open(options.outfile, 'w')
      eater.write(fp)



From bwarsaw@cnri.reston.va.us  Sun Feb 27 14:30:51 2000
From: bwarsaw@cnri.reston.va.us (Barry A. Warsaw)
Date: Sun, 27 Feb 2000 09:30:51 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/i18n pygettext.py,1.6,1.7
Message-ID: <200002271430.JAA01096@anthem.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/i18n
In directory anthem:/home/bwarsaw/projects/python/Tools/i18n

Modified Files:
	pygettext.py 
Log Message:
Two buglet fixes.  Peter Funk caught the bug in make_escapes:

    This will fold all ISO 8859 chars from the upper half of the
    charset into the lower half, which is ...ummm.... unintened.

The second is a typo in the reference to options.escape in main().


Index: pygettext.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/i18n/pygettext.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** pygettext.py	2000/02/26 20:56:47	1.6
--- pygettext.py	2000/02/27 14:30:48	1.7
***************
*** 166,176 ****
  def make_escapes(pass_iso8859):
      global escapes
      for i in range(256):
!         if pass_iso8859:
!             # Allow iso-8859 characters to pass through so that e.g. 'msgid
!             # "Höhe"' would result not result in 'msgid "H\366he"'.  Otherwise
!             # we escape any character outside the 32..126 range.
!             i = i % 128
!         if 32 <= i <= 126:
              escapes.append(chr(i))
          else:
--- 166,178 ----
  def make_escapes(pass_iso8859):
      global escapes
+     if pass_iso8859:
+         # Allow iso-8859 characters to pass through so that e.g. 'msgid
+         # "Höhe"' would result not result in 'msgid "H\366he"'.  Otherwise we
+         # escape any character outside the 32..126 range.
+         mod = 128
+     else:
+         mod = 256
      for i in range(256):
!         if 32 <= (i % mod) <= 126:
              escapes.append(chr(i))
          else:
***************
*** 374,378 ****
  
      # calculate escapes
!     make_escapes(options.escapes)
  
      # calculate all keywords
--- 376,380 ----
  
      # calculate escapes
!     make_escapes(options.escape)
  
      # calculate all keywords



From guido@cnri.reston.va.us  Sun Feb 27 15:34:32 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Sun, 27 Feb 2000 10:34:32 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/lib-old fmt.py,1.4,1.5
Message-ID: <200002271534.KAA21694@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/lib-old
In directory eric:/projects/python/develop/guido/src/Lib/lib-old

Modified Files:
	fmt.py 
Log Message:
Fixed a multi-arg append() call, discovered by Mark Favas.
Also removed some unnecessary backslases (inside parens).


Index: fmt.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/lib-old/fmt.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** fmt.py	1997/10/22 20:57:37	1.4
--- fmt.py	2000/02/27 15:34:29	1.5
***************
*** 223,229 ****
  			self.nextfont = self.font
  		space = int(space * self.space)
! 		self.para.words.append(self.nextfont, text, \
! 			self.d.textwidth(text), space, space, \
! 			self.ascent, self.descent)
  		self.nextfont = None
  	#
--- 223,229 ----
  			self.nextfont = self.font
  		space = int(space * self.space)
! 		self.para.words.append((self.nextfont, text,
! 			self.d.textwidth(text), space, space,
! 			self.ascent, self.descent))
  		self.nextfont = None
  	#
***************
*** 500,504 ****
  				hit = long1, long2
  				self.setselection(hit)
! 				self.window.show( \
  					(p.left, p.top), (p.right, p.bottom))
  				break
--- 500,504 ----
  				hit = long1, long2
  				self.setselection(hit)
! 				self.window.show(
  					(p.left, p.top), (p.right, p.bottom))
  				break



From guido@cnri.reston.va.us  Sun Feb 27 15:35:50 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Sun, 27 Feb 2000 10:35:50 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib/lib-tk Tkinter.py,1.135,1.136
Message-ID: <200002271535.KAA21724@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib/lib-tk
In directory eric:/projects/python/develop/guido/src/Lib/lib-tk

Modified Files:
	Tkinter.py 
Log Message:
Fix a typo in Barry's checkin.
Reported both by Gerrit Holl and Mark Favas.


Index: Tkinter.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/lib-tk/Tkinter.py,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -r1.135 -r1.136
*** Tkinter.py	2000/02/25 21:54:19	1.135
--- Tkinter.py	2000/02/27 15:35:47	1.136
***************
*** 1,5 ****
  # Tkinter.py -- Tk/Tcl widget wrappers
  
! __version__ = "$Revision: 1.135 $"
  
  import sys
--- 1,5 ----
  # Tkinter.py -- Tk/Tcl widget wrappers
  
! __version__ = "$Revision: 1.136 $"
  
  import sys
***************
*** 1811,1815 ****
  		# 'command' is the only supported keyword
  		callback = kwargs.get('command')
! 		if kwargs.has_key('command')
  			del kwargs['command']
  		if kwargs:
--- 1811,1815 ----
  		# 'command' is the only supported keyword
  		callback = kwargs.get('command')
! 		if kwargs.has_key('command'):
  			del kwargs['command']
  		if kwargs:



From guido@cnri.reston.va.us  Mon Feb 28 14:27:10 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 09:27:10 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib posixpath.py,1.28,1.29
Message-ID: <200002281427.JAA22692@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	posixpath.py 
Log Message:
Patch by Gerrit Holl to avoid doing two stat() calls in a row in walk().


Index: posixpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/posixpath.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** posixpath.py	2000/02/24 02:26:51	1.28
--- posixpath.py	2000/02/28 14:27:07	1.29
***************
*** 268,272 ****
          if name not in exceptions:
              name = join(top, name)
!             if isdir(name) and not islink(name):
                  walk(name, func, arg)
  
--- 268,273 ----
          if name not in exceptions:
              name = join(top, name)
!             st = os.lstat(name)
!             if stat.S_ISDIR(st[stat.ST_MODE]):
                  walk(name, func, arg)
  



From guido@cnri.reston.va.us  Mon Feb 28 15:00:43 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 10:00:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Include object.h,2.48,2.49
Message-ID: <200002281500.KAA22995@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Include
In directory eric:/projects/python/develop/guido/src/Include

Modified Files:
	object.h 
Log Message:
Patch by Mozhe Zadka, for __contains__ (overloading 'in').  This adds
a new proc type (objobjproc), a new slot sq_contains to
PySequenceMethods, and a new flag Py_TPFLAGS_HAVE_SEQUENCE_IN to
Py_TPFLAGS_DEFAULT.  More to follow.


Index: object.h
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Include/object.h,v
retrieving revision 2.48
retrieving revision 2.49
diff -C2 -r2.48 -r2.49
*** object.h	2000/01/20 22:32:45	2.48
--- object.h	2000/02/28 15:00:40	2.49
***************
*** 151,154 ****
--- 151,155 ----
  typedef int (*getsegcountproc) Py_PROTO((PyObject *, int *));
  typedef int (*getcharbufferproc) Py_PROTO((PyObject *, int, const char **));
+ typedef int (*objobjproc) Py_PROTO((PyObject *, PyObject *));
  
  typedef struct {
***************
*** 186,189 ****
--- 187,191 ----
  	intobjargproc sq_ass_item;
  	intintobjargproc sq_ass_slice;
+ 	objobjproc sq_contains;
  } PySequenceMethods;
  
***************
*** 318,322 ****
  #define Py_TPFLAGS_HAVE_GETCHARBUFFER  (1L<<0)
  
! #define Py_TPFLAGS_DEFAULT  (Py_TPFLAGS_HAVE_GETCHARBUFFER)
  
  #define PyType_HasFeature(t,f)  (((t)->tp_flags & (f)) != 0)
--- 320,328 ----
  #define Py_TPFLAGS_HAVE_GETCHARBUFFER  (1L<<0)
  
! /* PySequenceMethods contains sq_contains */
! #define Py_TPFLAGS_HAVE_SEQUENCE_IN (1L<<1)
! 
! #define Py_TPFLAGS_DEFAULT  (Py_TPFLAGS_HAVE_GETCHARBUFFER | \
!                              Py_TPFLAGS_HAVE_SEQUENCE_IN)
  
  #define PyType_HasFeature(t,f)  (((t)->tp_flags & (f)) != 0)



From guido@cnri.reston.va.us  Mon Feb 28 15:01:49 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 10:01:49 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects abstract.c,2.30,2.31
Message-ID: <200002281501.KAA23017@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	abstract.c 
Log Message:
Patch by Mozhe Zadka, for __contains__ (overloading 'in').  This
patches PySequence_Contains() to check for a valid sq_contains field.
More to follow.


Index: abstract.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/abstract.c,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -r2.30 -r2.31
*** abstract.c	2000/02/23 22:21:50	2.30
--- abstract.c	2000/02/28 15:01:46	2.31
***************
*** 1140,1144 ****
  		return 0;
  	}
! 
  	sq = w->ob_type->tp_as_sequence;
  	if (sq == NULL || sq->sq_item == NULL) {
--- 1140,1151 ----
  		return 0;
  	}
! 	if(PyType_HasFeature(w->ob_type, Py_TPFLAGS_HAVE_SEQUENCE_IN)) {
! 		sq = w->ob_type->tp_as_sequence;
! 	        if(sq != NULL && sq->sq_contains != NULL)
! 			return (*sq->sq_contains)(w, v);
! 	}
! 	
! 	/* If there is no better way to check whether an item is is contained,
! 	   do it the hard way */
  	sq = w->ob_type->tp_as_sequence;
  	if (sq == NULL || sq->sq_item == NULL) {



From guido@cnri.reston.va.us  Mon Feb 28 15:03:17 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 10:03:17 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects classobject.c,2.82,2.83
Message-ID: <200002281503.KAA23038@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	classobject.c 
Log Message:
Patch by Mozhe Zadka, for __contains__ (overloading 'in').  This adds
an instance method instance_contains as sq_contains.  It looks for
__contains__ and if not found falls back to previous behaviour.
Done.


Index: classobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/classobject.c,v
retrieving revision 2.82
retrieving revision 2.83
diff -C2 -r2.82 -r2.83
*** classobject.c	2000/01/20 22:32:54	2.82
--- classobject.c	2000/02/28 15:03:15	2.83
***************
*** 1066,1069 ****
--- 1066,1122 ----
  }
  
+ static int instance_contains(PyInstanceObject *inst, PyObject *member)
+ {
+ 	static PyObject *__contains__;
+ 	PyObject *func, *arg, *res;
+ 	int ret;
+ 
+ 	if(__contains__ == NULL) {
+ 		__contains__ = PyString_InternFromString("__contains__");
+ 		if(__contains__ == NULL)
+ 			return -1;
+ 	}
+ 	func = instance_getattr(inst, __contains__);
+ 	if(func == NULL) {
+ 		/* fall back to previous behaviour */
+ 		int i, cmp_res;
+ 
+ 		if(!PyErr_ExceptionMatches(PyExc_AttributeError))
+ 			return -1;
+ 		PyErr_Clear();
+ 		for(i=0;;i++) {
+ 			PyObject *obj = instance_item(inst, i);
+ 			int ret = 0;
+ 
+ 			if(obj == NULL) {
+ 				if(!PyErr_ExceptionMatches(PyExc_IndexError))
+ 					return -1;
+ 				PyErr_Clear();
+ 				return 0;
+ 			}
+ 			if(PyObject_Cmp(obj, member, &cmp_res) == -1)
+ 				ret = -1;
+ 			if(cmp_res == 0) 
+ 				ret = 1;
+ 			Py_DECREF(obj);
+ 			if(ret)
+ 				return ret;
+ 		}
+ 	}
+ 	arg = Py_BuildValue("(O)", member);
+ 	if(arg == NULL) {
+ 		Py_DECREF(func);
+ 		return -1;
+ 	}
+ 	res = PyEval_CallObject(func, arg);
+ 	Py_DECREF(func);
+ 	Py_DECREF(arg);
+ 	if(res == NULL) 
+ 		return -1;
+ 	ret = PyObject_IsTrue(res);
+ 	Py_DECREF(res);
+ 	return ret;
+ }
+ 
  static PySequenceMethods instance_as_sequence = {
  	(inquiry)instance_length, /*sq_length*/
***************
*** 1074,1077 ****
--- 1127,1131 ----
  	(intobjargproc)instance_ass_item, /*sq_ass_item*/
  	(intintobjargproc)instance_ass_slice, /*sq_ass_slice*/
+ 	(objobjproc)instance_contains, /* sq_contains */
  };
  
***************
*** 1406,1409 ****
--- 1460,1465 ----
  	(getattrofunc)instance_getattr, /*tp_getattro*/
  	(setattrofunc)instance_setattr, /*tp_setattro*/
+         0, /* tp_as_buffer */
+ 	Py_TPFLAGS_DEFAULT, /*tp_flags */
  };
  



From guido@cnri.reston.va.us  Mon Feb 28 15:12:29 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 10:12:29 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib StringIO.py,1.8,1.9 cgi.py,1.46,1.47 code.py,1.8,1.9 ftplib.py,1.40,1.41 getpass.py,1.8,1.9 imaplib.py,1.16,1.17 poplib.py,1.6,1.7 smtplib.py,1.21,1.22 whrandom.py,1.15,1.16
Message-ID: <200002281512.KAA23140@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	StringIO.py cgi.py code.py ftplib.py getpass.py imaplib.py 
	poplib.py smtplib.py whrandom.py 
Log Message:
Simple changes by Gerrit Holl - move author acknowledgements out of
docstrings into comments.



Index: StringIO.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/StringIO.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** StringIO.py	2000/02/02 15:10:14	1.8
--- StringIO.py	2000/02/28 15:12:25	1.9
***************
*** 20,23 ****
--- 20,25 ----
  Notes:
  - Using a real file is often faster (but less convenient).
+ - There's also a much faster implementation in C, called cStringIO, but
+   it's not subclassable.
  - fileno() is left unimplemented so that code which uses it triggers
    an exception early.

Index: cgi.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/cgi.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** cgi.py	2000/02/25 11:44:03	1.46
--- cgi.py	2000/02/28 15:12:25	1.47
***************
*** 400,419 ****
  most systems, and is a security liability as well.
  
! 
! History
! -------
! 
! Michael McLay started this module.  Steve Majewski changed the
! interface to SvFormContentDict and FormContentDict.  The multipart
! parsing was inspired by code submitted by Andreas Paepcke.  Guido van
! Rossum rewrote, reformatted and documented the module and is currently
! responsible for its maintenance.
! 
  
! XXX The module is getting pretty heavy with all those docstrings.
! Perhaps there should be a slimmed version that doesn't contain all those 
! backwards compatible and debugging classes and functions?
  
! """
  
  __version__ = "2.2"
--- 400,418 ----
  most systems, and is a security liability as well.
  
! """
  
! # XXX The module is getting pretty heavy with all those docstrings.
! # Perhaps there should be a slimmed version that doesn't contain all those 
! # backwards compatible and debugging classes and functions?
  
! # History
! # -------
! # 
! # Michael McLay started this module.  Steve Majewski changed the
! # interface to SvFormContentDict and FormContentDict.  The multipart
! # parsing was inspired by code submitted by Andreas Paepcke.  Guido van
! # Rossum rewrote, reformatted and documented the module and is currently
! # responsible for its maintenance.
! # 
  
  __version__ = "2.2"

Index: code.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/code.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** code.py	1998/10/22 21:56:44	1.8
--- code.py	2000/02/28 15:12:25	1.9
***************
*** 1,6 ****
  """Utilities needed to emulate Python's interactive interpreter.
  
- Inspired by similar code by Jeff Epler and Fredrik Lundh.
  """
  
  
--- 1,7 ----
  """Utilities needed to emulate Python's interactive interpreter.
  
  """
+ 
+ # Inspired by similar code by Jeff Epler and Fredrik Lundh.
  
  

Index: ftplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ftplib.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** ftplib.py	2000/02/04 15:39:29	1.40
--- ftplib.py	2000/02/28 15:12:25	1.41
***************
*** 4,12 ****
  (FTP), by J. Postel and J. Reynolds
  
- Changes and improvements suggested by Steve Majewski.
- Modified by Jack to work on the mac.
- Modified by Siebren to support docstrings and PASV.
- 
- 
  Example:
  
--- 4,7 ----
***************
*** 35,38 ****
--- 30,38 ----
  """
  
+ # 
+ # Changes and improvements suggested by Steve Majewski.
+ # Modified by Jack to work on the mac.
+ # Modified by Siebren to support docstrings and PASV.
+ #
  
  import os

Index: getpass.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/getpass.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** getpass.py	1999/10/18 22:25:22	1.8
--- getpass.py	2000/02/28 15:12:25	1.9
***************
*** 7,13 ****
  On the Mac EasyDialogs.AskPassword is used, if available.
  
- Authors: Piers Lauder (original)
-          Guido van Rossum (Windows support and cleanup)
  """
  
  import sys
--- 7,14 ----
  On the Mac EasyDialogs.AskPassword is used, if available.
  
  """
+ 
+ # Authors: Piers Lauder (original)
+ #          Guido van Rossum (Windows support and cleanup)
  
  import sys

Index: imaplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imaplib.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** imaplib.py	2000/02/24 02:24:50	1.16
--- imaplib.py	2000/02/28 15:12:25	1.17
***************
*** 4,11 ****
  Based on RFC 2060.
  
- Author: Piers Lauder <piers@cs.su.oz.au> December 1997.
- 
- Authentication code contributed by Donn Cave <donn@u.washington.edu> June 1998.
- 
  Public class:		IMAP4
  Public variable:	Debug
--- 4,7 ----
***************
*** 15,18 ****
--- 11,18 ----
  			Time2Internaldate
  """
+ 
+ # Author: Piers Lauder <piers@cs.su.oz.au> December 1997.
+ # 
+ # Authentication code contributed by Donn Cave <donn@u.washington.edu> June 1998.
  
  __version__ = "2.32"

Index: poplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/poplib.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** poplib.py	1999/05/13 18:47:25	1.6
--- poplib.py	2000/02/28 15:12:25	1.7
***************
*** 2,10 ****
  
  Based on the J. Myers POP3 draft, Jan. 96
- 
- Author: David Ascher <david_ascher@brown.edu>
-         [heavily stealing from nntplib.py]
- Updated: Piers Lauder <piers@cs.su.oz.au> [Jul '97]
  """
  
  # Example (see the test function at the end of this file)
--- 2,10 ----
  
  Based on the J. Myers POP3 draft, Jan. 96
  """
+ 
+ # Author: David Ascher <david_ascher@brown.edu>
+ #         [heavily stealing from nntplib.py]
+ # Updated: Piers Lauder <piers@cs.su.oz.au> [Jul '97]
  
  # Example (see the test function at the end of this file)

Index: smtplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/smtplib.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** smtplib.py	2000/02/04 15:39:30	1.21
--- smtplib.py	2000/02/28 15:12:25	1.22
***************
*** 3,14 ****
  """SMTP/ESMTP client class.
  
- Author: The Dragon De Monsyne <dragondm@integral.org>
- ESMTP support, test code and doc fixes added by
-     Eric S. Raymond <esr@thyrsus.com>
- Better RFC 821 compliance (MAIL and RCPT, and CRLF in data)
-     by Carey Evans <c.evans@clear.net.nz>, for picky mail servers.
-    
- This was modified from the Python 1.5 library HTTP lib.
- 
  This should follow RFC 821 (SMTP) and RFC 1869 (ESMTP).
  
--- 3,6 ----
***************
*** 39,42 ****
--- 31,42 ----
    >>> s.quit()
  """
+ 
+ # Author: The Dragon De Monsyne <dragondm@integral.org>
+ # ESMTP support, test code and doc fixes added by
+ #     Eric S. Raymond <esr@thyrsus.com>
+ # Better RFC 821 compliance (MAIL and RCPT, and CRLF in data)
+ #     by Carey Evans <c.evans@clear.net.nz>, for picky mail servers.
+ #    
+ # This was modified from the Python 1.5 library HTTP lib.
  
  import socket

Index: whrandom.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/whrandom.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** whrandom.py	2000/02/04 15:28:42	1.15
--- whrandom.py	2000/02/28 15:12:25	1.16
***************
*** 26,34 ****
  
  
- Translated by Guido van Rossum from C source provided by
- Adrian Baddeley.
  
- 
- 
  Multi-threading note: the random number generator used here is not
  thread-safe; it is possible that nearly simultaneous calls in
--- 26,30 ----
***************
*** 37,40 ****
--- 33,40 ----
  down in the serial case by using a lock here.)
  """
+ 
+ # Translated by Guido van Rossum from C source provided by
+ # Adrian Baddeley.
+ 
  
  class whrandom:



From akuchlin@CNRI.Reston.VA.US  Mon Feb 28 17:25:17 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Mon, 28 Feb 2000 12:25:17 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Demo/dns dnslib.py,1.2,1.3
Message-ID: <200002281725.MAA17902@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Demo/dns
In directory amarok:/home/akuchlin/src/Python-1.5/Demo/dns

Modified Files:
	dnslib.py 
Log Message:
Fix use of list.append() with multiple arguments


Index: dnslib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Demo/dns/dnslib.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** dnslib.py	1996/07/30 19:02:52	1.2
--- dnslib.py	2000/02/28 17:25:14	1.3
***************
*** 102,106 ****
  			n = len(label)
  			if offset + len(buf) < 0x3FFF:
! 				index.append(keys[j], offset + len(buf))
  			else:
  				print 'dnslib.Packer.addname:',
--- 102,106 ----
  			n = len(label)
  			if offset + len(buf) < 0x3FFF:
! 				index.append( (keys[j], offset + len(buf)) )
  			else:
  				print 'dnslib.Packer.addname:',



From guido@cnri.reston.va.us  Mon Feb 28 19:52:56 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 14:52:56 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src Makefile.in,1.82,1.83
Message-ID: <200002281952.OAA03570@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src
In directory eric:/projects/python/develop/guido/src

Modified Files:
	Makefile.in 
Log Message:
Drop the support level for stdwin a notch -- the contents of
lib-stdwin is no longer installed.

Increase the support level for other obsolete modules a bit: install
lib-old by default.  It still isn't in the path by default, but at
least it's easier to add to your $PYTHONPATH this way.  (This makes
sense because in 1.6 we're much more aggressive with declaring modules
obsolete.)


Index: Makefile.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Makefile.in,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -r1.82 -r1.83
*** Makefile.in	2000/02/10 17:23:44	1.82
--- Makefile.in	2000/02/28 19:52:53	1.83
***************
*** 290,294 ****
  PLATDIR=	plat-$(MACHDEP)
  MACHDEPS=	$(PLATDIR)
! LIBSUBDIRS=	lib-stdwin lib-tk test test/output $(MACHDEPS)
  libinstall:	python $(srcdir)/Lib/$(PLATDIR)
  		@for i in $(SCRIPTDIR) $(LIBDEST); \
--- 290,294 ----
  PLATDIR=	plat-$(MACHDEP)
  MACHDEPS=	$(PLATDIR)
! LIBSUBDIRS=	lib-old lib-tk test test/output $(MACHDEPS)
  libinstall:	python $(srcdir)/Lib/$(PLATDIR)
  		@for i in $(SCRIPTDIR) $(LIBDEST); \



From fdrake@weyr.cnri.reston.va.us  Mon Feb 28 20:39:15 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 28 Feb 2000 15:39:15 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/html index.html.in,1.4.4.1,1.4.4.2
Message-ID: <200002282039.PAA24087@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/html
In directory weyr:/home/fdrake/projects/python/Doc-152p1/html

Modified Files:
      Tag: release152p1-patches
	index.html.in 
Log Message:

Small formatting nit: center the table that displays the list of
titles, since the headers and such are centered.


Index: index.html.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/html/index.html.in,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -C2 -r1.4.4.1 -r1.4.4.2
*** index.html.in	2000/02/04 17:40:02	1.4.4.1
--- index.html.in	2000/02/28 20:39:12	1.4.4.2
***************
*** 39,43 ****
      </div>
  
!     <table>
        <tbody>
        <tr><td>
--- 39,43 ----
      </div>
  
!     <table align="center">
        <tbody>
        <tr><td>



From fdrake@weyr.cnri.reston.va.us  Mon Feb 28 20:49:17 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 28 Feb 2000 15:49:17 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libwhrandom.tex,1.10.4.1,1.10.4.2
Message-ID: <200002282049.PAA24187@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc-152p1/lib

Modified Files:
      Tag: release152p1-patches
	libwhrandom.tex 
Log Message:

Partial improvement in response to comments from Jan Kim
<kim@mpiz-koeln.mpg.de>.


Index: libwhrandom.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libwhrandom.tex,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -C2 -r1.10.4.1 -r1.10.4.2
*** libwhrandom.tex	2000/01/10 18:00:53	1.10.4.1
--- libwhrandom.tex	2000/02/28 20:49:14	1.10.4.2
***************
*** 12,20 ****
  following method, specific to the Wichmann-Hill algorithm:
  
! \begin{funcdesc}{seed}{x, y, z}
    Initializes the random number generator from the integers \var{x},
    \var{y} and \var{z}.  When the module is first imported, the random
    number is initialized using values derived from the current time.
! \end{funcdesc}
  
  
--- 12,26 ----
  following method, specific to the Wichmann-Hill algorithm:
  
! \begin{methoddesc}[whrandom]{seed}{\optional{x, y, z}}
    Initializes the random number generator from the integers \var{x},
    \var{y} and \var{z}.  When the module is first imported, the random
    number is initialized using values derived from the current time.
!   If \var{x}, \var{y}, and \var{z} are either omitted or \code{0}, the 
!   seed will be computed from the current system time.  If one or two
!   of the parameters are \code{0}, but not all three, the zero values
!   are replaced by ones.  This causes some appearantly different seeds
!   to be equal, with the corresponding result on the pseudo-random
!   series produced by the generator.
! \end{methoddesc}
  
  
***************
*** 23,26 ****
--- 29,33 ----
  available at the module level.  Therefore one can write either 
  \code{N = whrandom.random()} or:
+ 
  \begin{verbatim}
  generator = whrandom.whrandom()
***************
*** 28,31 ****
--- 35,40 ----
  \end{verbatim}
  
+ Note that using separate instances of the generator leads to
+ independent sequences of pseudo-random numbers.
  
  \begin{seealso}



From fdrake@weyr.cnri.reston.va.us  Mon Feb 28 20:52:22 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 28 Feb 2000 15:52:22 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/perl l2hinit.perl,1.38.4.3,1.38.4.4
Message-ID: <200002282052.PAA24223@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/perl
In directory weyr:/home/fdrake/projects/python/Doc-152p1/perl

Modified Files:
      Tag: release152p1-patches
	l2hinit.perl 
Log Message:

Slight cleanup of module index code.


Index: l2hinit.perl
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/perl/l2hinit.perl,v
retrieving revision 1.38.4.3
retrieving revision 1.38.4.4
diff -C2 -r1.38.4.3 -r1.38.4.4
*** l2hinit.perl	2000/02/21 17:49:26	1.38.4.3
--- l2hinit.perl	2000/02/28 20:52:19	1.38.4.4
***************
*** 295,302 ****
  		     . '</span>)</em>');
  	}
! 	print MODIDXFILE
! 	  $moditem
! 	    . $IDXFILE_FIELD_SEP
! 	    . "<tt class='module'>$key</tt>$plat###\n";
      }
      close(MODIDXFILE);
--- 295,299 ----
  		     . '</span>)</em>');
  	}
! 	print MODIDXFILE $moditem . $IDXFILE_FIELD_SEP . "$key$plat###\n";
      }
      close(MODIDXFILE);



From fdrake@weyr.cnri.reston.va.us  Mon Feb 28 20:59:06 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 28 Feb 2000 15:59:06 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib ConfigParser.py,1.14,1.15
Message-ID: <200002282059.PAA24383@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	ConfigParser.py 
Log Message:

(Finally!)  Changes related to the ConfigParser/INI-file topics
discussed on c.l.py last January.  Specifically:
  - more characters allowed in section & option names
  - if '=' is used to separate the option & value, the value can be
    followed by a comment of the form '\s;'


Index: ConfigParser.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ConfigParser.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** ConfigParser.py	1999/10/12 16:12:48	1.14
--- ConfigParser.py	2000/02/28 20:59:03	1.15
***************
*** 293,302 ****
      SECTCRE = re.compile(
          r'\['                                 # [
!         r'(?P<header>[-\w]+)'                 # `-', `_' or any alphanum
          r'\]'                                 # ]
          )
      OPTCRE = re.compile(
!         r'(?P<option>[-.\w]+)'                # - . _ alphanum
!         r'[ \t]*[:=][ \t]*'                   # any number of space/tab,
                                                # followed by separator
                                                # (either : or =), followed
--- 293,302 ----
      SECTCRE = re.compile(
          r'\['                                 # [
!         r'(?P<header>[-\w_.*,(){}]+)'         # `-', `_' or any alphanum
          r'\]'                                 # ]
          )
      OPTCRE = re.compile(
!         r'(?P<option>[-\w_.*,(){}]+)'         # - . _ alphanum
!         r'[ \t]*(?P<vi>[:=])[ \t]*'           # any number of space/tab,
                                                # followed by separator
                                                # (either : or =), followed
***************
*** 328,332 ****
                  continue
              if string.lower(string.split(line)[0]) == 'rem' \
!                and line[0] == "r":      # no leading whitespace
                  continue
              # continuation line?
--- 328,332 ----
                  continue
              if string.lower(string.split(line)[0]) == 'rem' \
!                and line[0] in "rR":      # no leading whitespace
                  continue
              # continuation line?
***************
*** 357,362 ****
                      mo = self.OPTCRE.match(line)
                      if mo:
!                         optname, optval = mo.group('option', 'value')
                          optname = string.lower(optname)
                          optval = string.strip(optval)
                          # allow empty values
--- 357,368 ----
                      mo = self.OPTCRE.match(line)
                      if mo:
!                         optname, vi, optval = mo.group('option', 'vi', 'value')
                          optname = string.lower(optname)
+                         if vi == '=' and ';' in optval:
+                             # ';' is a comment delimiter only if it follows
+                             # a spacing character
+                             pos = string.find(optval, ';')
+                             if pos and optval[pos-1] in string.whitespace:
+                                 optval = optval[:pos]
                          optval = string.strip(optval)
                          # allow empty values



From fdrake@weyr.cnri.reston.va.us  Mon Feb 28 21:04:56 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 28 Feb 2000 16:04:56 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc Makefile,1.190.2.3,1.190.2.4
Message-ID: <200002282104.QAA24433@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p1

Modified Files:
      Tag: release152p1-patches
	Makefile 
Log Message:

Bump the release number.


Index: Makefile
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/Makefile,v
retrieving revision 1.190.2.3
retrieving revision 1.190.2.4
diff -C2 -r1.190.2.3 -r1.190.2.4
*** Makefile	2000/02/21 17:48:40	1.190.2.3
--- Makefile	2000/02/28 21:04:53	1.190.2.4
***************
*** 60,64 ****
  # This is the *documentation* release, and is used to construct the file
  # names of the downloadable tarballs.
! RELEASE=1.5.2p1
  
  
--- 60,64 ----
  # This is the *documentation* release, and is used to construct the file
  # names of the downloadable tarballs.
! RELEASE=1.5.2p2
  
  



From guido@cnri.reston.va.us  Mon Feb 28 22:37:33 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Mon, 28 Feb 2000 17:37:33 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib imaplib.py,1.17,1.18
Message-ID: <200002282237.RAA03801@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	imaplib.py 
Log Message:
Patch by Piers Lauder, who writes:

This patch is re: Lucas.Dejonge@awtpl.com.au: [Python-bugs-list] imaplib -
not complying with RFC (PR#218)

Lucas de Jonge reported that the code in imaplib that detects a read-write
to read-only change doesn't comply with RFC 2060.


Index: imaplib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/imaplib.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** imaplib.py	2000/02/28 15:12:25	1.17
--- imaplib.py	2000/02/28 22:37:30	1.18
***************
*** 16,20 ****
  # Authentication code contributed by Donn Cave <donn@u.washington.edu> June 1998.
  
! __version__ = "2.32"
  
  import binascii, re, socket, string, time, random, sys
--- 16,20 ----
  # Authentication code contributed by Donn Cave <donn@u.washington.edu> June 1998.
  
! __version__ = "2.33"
  
  import binascii, re, socket, string, time, random, sys
***************
*** 129,132 ****
--- 129,133 ----
  		self.untagged_responses = {}	# {typ: [data, ...], ...}
  		self.continuation_response = ''	# Last continuation response
+ 		self.is_readonly = None		# READ-ONLY desired state
  		self.tagnum = 0
  
***************
*** 471,474 ****
--- 472,476 ----
  		# Mandated responses are ('FLAGS', 'EXISTS', 'RECENT', 'UIDVALIDITY')
  		self.untagged_responses = {}	# Flush old responses.
+ 		self.is_readonly = readonly
  		if readonly:
  			name = 'EXAMINE'
***************
*** 480,484 ****
  			return typ, dat
  		self.state = 'SELECTED'
! 		if not self.untagged_responses.has_key('READ-WRITE') \
  			and not readonly:
  			if __debug__:
--- 482,486 ----
  			return typ, dat
  		self.state = 'SELECTED'
! 		if self.untagged_responses.has_key('READ-ONLY') \
  			and not readonly:
  			if __debug__:
***************
*** 595,601 ****
  				del self.untagged_responses[typ]
  
! 		if self.untagged_responses.has_key('READ-WRITE') \
! 		and self.untagged_responses.has_key('READ-ONLY'):
! 			del self.untagged_responses['READ-WRITE']
  			raise self.readonly('mailbox status changed to READ-ONLY')
  
--- 597,602 ----
  				del self.untagged_responses[typ]
  
! 		if self.untagged_responses.has_key('READ-ONLY') \
! 		and not self.is_readonly:
  			raise self.readonly('mailbox status changed to READ-ONLY')
  



From fdrake@weyr.cnri.reston.va.us  Mon Feb 28 23:23:59 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Mon, 28 Feb 2000 18:23:59 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib ConfigParser.py,1.15,1.16
Message-ID: <200002282323.SAA27382@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory weyr:/home/fdrake/projects/python/Lib

Modified Files:
	ConfigParser.py 
Log Message:

Fix comments relating to the specific regexs used to parse section and 
option names; errors noted by Greg Stein <gstein@lyra.org>.


Index: ConfigParser.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/ConfigParser.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** ConfigParser.py	2000/02/28 20:59:03	1.15
--- ConfigParser.py	2000/02/28 23:23:55	1.16
***************
*** 293,301 ****
      SECTCRE = re.compile(
          r'\['                                 # [
!         r'(?P<header>[-\w_.*,(){}]+)'         # `-', `_' or any alphanum
          r'\]'                                 # ]
          )
      OPTCRE = re.compile(
!         r'(?P<option>[-\w_.*,(){}]+)'         # - . _ alphanum
          r'[ \t]*(?P<vi>[:=])[ \t]*'           # any number of space/tab,
                                                # followed by separator
--- 293,301 ----
      SECTCRE = re.compile(
          r'\['                                 # [
!         r'(?P<header>[-\w_.*,(){}]+)'         # a lot of stuff found by IvL
          r'\]'                                 # ]
          )
      OPTCRE = re.compile(
!         r'(?P<option>[-\w_.*,(){}]+)'         # a lot of stuff found by IvL
          r'[ \t]*(?P<vi>[:=])[ \t]*'           # any number of space/tab,
                                                # followed by separator



From akuchlin@CNRI.Reston.VA.US  Tue Feb 29 00:10:27 2000
From: akuchlin@CNRI.Reston.VA.US (Andrew M. Kuchling)
Date: Mon, 28 Feb 2000 19:10:27 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib threading.py,1.6,1.7
Message-ID: <200002290010.TAA18675@amarok.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory amarok:/home/akuchlin/src/Python-1.5/Lib

Modified Files:
	threading.py 
Log Message:
Fix a typo in a comment


Index: threading.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/threading.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** threading.py	2000/02/04 15:28:41	1.6
--- threading.py	2000/02/29 00:10:24	1.7
***************
*** 238,242 ****
  class _Semaphore(_Verbose):
  
!     # After Tim Peters' semaphore class, but bnot quite the same (no maximum)
  
      def __init__(self, value=1, verbose=None):
--- 238,242 ----
  class _Semaphore(_Verbose):
  
!     # After Tim Peters' semaphore class, but not quite the same (no maximum)
  
      def __init__(self, value=1, verbose=None):



From fdrake@weyr.cnri.reston.va.us  Tue Feb 29 05:19:41 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 29 Feb 2000 00:19:41 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/lib libos.tex,1.36,1.37
Message-ID: <200002290519.AAA27789@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/lib
In directory weyr:/home/fdrake/projects/python/Doc/lib

Modified Files:
	libos.tex 
Log Message:

Update portability information for the spawn*() functions and related
constants.  Someone will need to fill in information on the spawn*()
functions that aren't listed.


Index: libos.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/lib/libos.tex,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** libos.tex	1999/12/15 19:39:04	1.36
--- libos.tex	2000/02/29 05:19:38	1.37
***************
*** 789,793 ****
  information; the constants are exposed to the Python programmer as
  listed below.
! Availability: Windows.
  \versionadded{1.5.2}
  \end{funcdesc}
--- 789,793 ----
  information; the constants are exposed to the Python programmer as
  listed below.
! Availability: \UNIX{}, Windows.
  \versionadded{1.5.2}
  \end{funcdesc}
***************
*** 800,804 ****
  \Cpp{} Runtime Library documentation for further information; the
  constants are exposed to the Python programmer as listed below.
! Availability: Windows.
  \versionadded{1.5.2}
  \end{funcdesc}
--- 800,804 ----
  \Cpp{} Runtime Library documentation for further information; the
  constants are exposed to the Python programmer as listed below.
! Availability: \UNIX{}, Windows.
  \versionadded{1.5.2}
  \end{funcdesc}
***************
*** 807,814 ****
  \dataline{P_NOWAIT}
  \dataline{P_NOWAITO}
- \dataline{P_OVERLAY}
- \dataline{P_DETACH}
  Possible values for the \var{mode} parameter to \function{spawnv()}
  and \function{spawnve()}.
  Availability: Windows.
  \versionadded{1.5.2}
--- 807,821 ----
  \dataline{P_NOWAIT}
  \dataline{P_NOWAITO}
  Possible values for the \var{mode} parameter to \function{spawnv()}
  and \function{spawnve()}.
+ Availability: \UNIX{}, Windows.
+ \versionadded{1.5.2}
+ \end{datadesc}
+ 
+ \begin{datadesc}{P_OVERLAY}
+ \dataline{P_DETACH}
+ Possible values for the \var{mode} parameter to \function{spawnv()}
+ and \function{spawnve()}.  These are less portable than those listed
+ above.
  Availability: Windows.
  \versionadded{1.5.2}



Return-Path: <artcom0!pf@artcom-gmbh.de>
Delivered-To: python-checkins@python.org
Received: from mail.provi.de (mail.hamburg.pop.de [193.98.9.7])
	by dinsdale.python.org (Postfix) with ESMTP id 2F6041CD45
	for <python-checkins@python.org>; Tue, 29 Feb 2000 02:51:55 -0500 (EST)
Received: from mars.hamburg.pop.de ([195.222.210.104] helo=mail.bremen.pop.de)
	by mail.provi.de with esmtp (Exim 3.13 #1)
	id 12PhTJ-0006s0-00; Tue, 29 Feb 2000 08:53:33 +0100
Received: from uucp by mail.bremen.pop.de with local-rmail (Exim 2.02 #2)
	id 12PhWt-0005kA-00; Tue, 29 Feb 2000 08:57:15 +0100
Received: from artcom7.UUCP (uartcom@localhost)
	by artinet.artcom-gmbh.de (8.8.8+Sun/8.8.8) with UUCP id IAA03983;
	Tue, 29 Feb 2000 08:52:07 +0100 (MET)
Received: from artcom0 by artcom7.artcom-gmbh.de  with uucp
	(Smail3.2 #1) id m12PhQy-000pAXC; Tue, 29 Feb 2000 08:51:08 +0100 (MET)
Received: by artcom0.artcom-gmbh.de (Smail3.2 #1)
	id m12Ph1W-000CnCC; Tue, 29 Feb 2000 08:24:50 +0100 (MET)
Message-Id: <m12Ph1W-000CnCC@artcom0.artcom-gmbh.de>
From: pf@artcom-gmbh.de (Peter Funk)
Subject: Re: [Python-checkins] CVS: python/dist/src Makefile.in,1.82,1.83
In-Reply-To: <200002281952.OAA03570@eric.cnri.reston.va.us> from Guido van Rossum at "Feb 28, 2000  2:52:56 pm"
To: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:24:50 +0100 (MET)
Cc: python-checkins@python.org
Organization: privat (Mitglied im IN e.V.)
Phone: +49 4222 950270
X-Fax: +49 4222 950260
X-Commercial-ReplyTo: pf@artcom-gmbh.de (Peter Funk)
X-Mailer: ELM [version 2.4ME+ PL47 (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: python-checkins-admin@python.org
Errors-To: python-checkins-admin@python.org
X-BeenThere: python-checkins@python.org
X-Mailman-Version: 1.2 (beta 1)
Precedence: bulk
List-Id: Check-in messages from the Python maintainers <python-checkins.python.org>

Guido van Rossum wrote:
> Increase the support level for other obsolete modules a bit: install
> lib-old by default.  It still isn't in the path by default, but at
> least it's easier to add to your $PYTHONPATH this way.  (This makes
> sense because in 1.6 we're much more aggressive with declaring modules
----------------------------------^^^^^^^^^^^^^^^
> obsolete.)

Indeed!  IMHO it would make much sense if you (Guido) post a list of 
this modules (that have been moved to lib-old) as an official annoucement 
several weeks *BEFORE*  Python 1.6 will come out.

Eventually something like this (sorry english is not my native language):  

"""With the upcoming release of Python 1.6 the following modules,
   which were part of the standard library until and including
   Python 1.5.2, have been declared obsolete and have been moved
   into the sub directory lib-old, which is *NOT* on your PYTHONPATH
   by default.  Please check your existing Python applications and 
   update them, if ever possible in preparation for Python 1.6:
   
   ... list of modules..."""

Regards, Peter
-- 
Peter Funk, Oldenburger Str.86, D-27777 Ganderkesee, Germany, Fax:+49 4222950260
office: +49 421 20419-0 (ArtCom GmbH, Grazer Str.8, D-28359 Bremen)


From guido@cnri.reston.va.us  Tue Feb 29 13:00:19 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:00:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts mailerdaemon.py,1.7,1.8
Message-ID: <200002291300.IAA04572@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Modified Files:
	mailerdaemon.py 
Log Message:
Fix multi-arg append().


Index: mailerdaemon.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/scripts/mailerdaemon.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** mailerdaemon.py	1998/10/09 13:27:49	1.7
--- mailerdaemon.py	2000/02/29 13:00:16	1.8
***************
*** 219,223 ****
      list = []
      for e in errordict.keys():
!         list.append(errordict[e], errorfirst[e], errorlast[e], e)
      list.sort()
      for num, first, last, e in list:
--- 219,223 ----
      list = []
      for e in errordict.keys():
!         list.append((errordict[e], errorfirst[e], errorlast[e], e))
      list.sort()
      for num, first, last, e in list:



From guido@cnri.reston.va.us  Tue Feb 29 13:05:51 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:05:51 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts checkappend.py,NONE,1.1
Message-ID: <200002291305.IAA04614@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Added Files:
	checkappend.py 
Log Message:
Script by Tim Peters to discover illegal append() calls.





From guido@cnri.reston.va.us  Tue Feb 29 13:08:47 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:08:47 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Tools/scripts checkappend.py,1.1,1.2
Message-ID: <200002291308.IAA04647@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Tools/scripts
In directory eric:/projects/python/develop/guido/src/Tools/scripts

Modified Files:
	checkappend.py 
Log Message:
Correct type error in getopt.error handling code.


Index: checkappend.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Tools/scripts/checkappend.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** checkappend.py	2000/02/29 13:05:49	1.1
--- checkappend.py	2000/02/29 13:08:44	1.2
***************
*** 53,57 ****
          opts, args = getopt.getopt(sys.argv[1:], "v")
      except getopt.error, msg:
!         errprint(msg + "\n\n" + __doc__)
          return
      for opt, optarg in opts:
--- 53,57 ----
          opts, args = getopt.getopt(sys.argv[1:], "v")
      except getopt.error, msg:
!         errprint(str(msg) + "\n\n" + __doc__)
          return
      for opt, optarg in opts:



From guido@cnri.reston.va.us  Tue Feb 29 13:31:19 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:31:19 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Lib posixpath.py,1.29,1.30
Message-ID: <200002291331.IAA04743@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Lib
In directory eric:/projects/python/develop/guido/src/Lib

Modified Files:
	posixpath.py 
Log Message:
Remove some redundant logic from walk() -- there's no need to check
for "." and "..", since listdir() no longer returns those.


Index: posixpath.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/posixpath.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** posixpath.py	2000/02/28 14:27:07	1.29
--- posixpath.py	2000/02/29 13:31:16	1.30
***************
*** 264,270 ****
          return
      func(arg, top, names)
-     exceptions = ('.', '..')
      for name in names:
-         if name not in exceptions:
              name = join(top, name)
              st = os.lstat(name)
--- 264,268 ----



From guido@python.org  Tue Feb 29 13:38:01 2000
From: guido@python.org (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:38:01 -0500
Subject: [Python-checkins] CVS: python/dist/src Makefile.in,1.82,1.83
In-Reply-To: Your message of "Tue, 29 Feb 2000 08:24:50 +0100."
 <m12Ph1W-000CnCC@artcom0.artcom-gmbh.de>
References: <m12Ph1W-000CnCC@artcom0.artcom-gmbh.de>
Message-ID: <200002291338.IAA04782@eric.cnri.reston.va.us>

> Indeed!  IMHO it would make much sense if you (Guido) post a list of 
> this modules (that have been moved to lib-old) as an official annoucement 
> several weeks *BEFORE*  Python 1.6 will come out.

You can already extract this from the updated documetation on the
website (which has a list of obsolete modules).

But you're righ,t it would be good to be open about this.  I'll think
about it.

--Guido van Rossum (home page: http://www.python.org/~guido/)


Return-Path: <fredrik@pythonware.com>
Delivered-To: python-checkins@python.org
Received: from pythonware.com (python-010.pythonware.com [194.18.155.250])
	by dinsdale.python.org (Postfix) with ESMTP id 7D0F81CD1E
	for <python-checkins@python.org>; Tue, 29 Feb 2000 07:47:17 -0500 (EST)
Received: from panik (panik.secret.pythonware.com [194.18.155.242])
	by pythonware.com (8.8.7/8.8.5) with SMTP id OAA00501
	for <python-checkins@python.org>; Tue, 29 Feb 2000 14:59:37 +0100
Message-ID: <00e601bf82b3$62570450$f29b12c2@secret.pythonware.com>
From: "Fredrik Lundh" <fredrik@pythonware.com>
To: <python-checkins@python.org>
References: <m12Ph1W-000CnCC@artcom0.artcom-gmbh.de>
Subject: Re: [Python-checkins] CVS: python/dist/src Makefile.in,1.82,1.83
Date: Tue, 29 Feb 2000 13:49:13 +0100
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 5.00.2919.6600
X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2919.6600
Sender: python-checkins-admin@python.org
Errors-To: python-checkins-admin@python.org
X-BeenThere: python-checkins@python.org
X-Mailman-Version: 1.2 (beta 1)
Precedence: bulk
List-Id: Check-in messages from the Python maintainers <python-checkins.python.org>

Peter Funk wrote:
> > Increase the support level for other obsolete modules a bit: install
> > lib-old by default.  It still isn't in the path by default, but at
> > least it's easier to add to your $PYTHONPATH this way.  (This makes
> > sense because in 1.6 we're much more aggressive with declaring =
modules
> ----------------------------------^^^^^^^^^^^^^^^
> > obsolete.)
>=20
> Indeed!  IMHO it would make much sense if you (Guido) post a list of=20
> this modules (that have been moved to lib-old) as an official =
annoucement=20
> several weeks *BEFORE*  Python 1.6 will come out.

obsoletemodulenanny.py, anyone?

(hey, it worked yesterday ;-)

</F>



From guido@cnri.reston.va.us  Tue Feb 29 13:59:31 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:59:31 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Objects complexobject.c,2.22,2.23 fileobject.c,2.69,2.70 stringobject.c,2.54,2.55
Message-ID: <200002291359.IAA05296@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Objects
In directory eric:/projects/python/develop/guido/src/Objects

Modified Files:
	complexobject.c fileobject.c stringobject.c 
Log Message:
Massive patch by Skip Montanaro to add ":name" to as many
PyArg_ParseTuple() format string arguments as possible.


Index: complexobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/complexobject.c,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -r2.22 -r2.23
*** complexobject.c	2000/01/20 22:32:54	2.22
--- complexobject.c	2000/02/29 13:59:28	2.23
***************
*** 579,583 ****
  {
  	Py_complex c;
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	c = ((PyComplexObject *)self)->cval;
--- 579,583 ----
  {
  	Py_complex c;
! 	if (!PyArg_ParseTuple(args, ":conjugate"))
  		return NULL;
  	c = ((PyComplexObject *)self)->cval;

Index: fileobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/fileobject.c,v
retrieving revision 2.69
retrieving revision 2.70
diff -C2 -r2.69 -r2.70
*** fileobject.c	1999/08/27 20:38:57	2.69
--- fileobject.c	2000/02/29 13:59:28	2.70
***************
*** 264,268 ****
  		return err_closed();
  	whence = 0;
! 	if (!PyArg_ParseTuple(args, "O|i", &offobj, &whence))
  		return NULL;
  #if !defined(HAVE_LARGEFILE_SUPPORT)
--- 264,268 ----
  		return err_closed();
  	whence = 0;
! 	if (!PyArg_ParseTuple(args, "O|i:seek", &offobj, &whence))
  		return NULL;
  #if !defined(HAVE_LARGEFILE_SUPPORT)
***************
*** 306,310 ****
  		return err_closed();
  	newsizeobj = NULL;
! 	if (!PyArg_ParseTuple(args, "|O", &newsizeobj))
  		return NULL;
  	if (newsizeobj != NULL) {
--- 306,310 ----
  		return err_closed();
  	newsizeobj = NULL;
! 	if (!PyArg_ParseTuple(args, "|O:truncate", &newsizeobj))
  		return NULL;
  	if (newsizeobj != NULL) {
***************
*** 519,523 ****
  	if (f->f_fp == NULL)
  		return err_closed();
! 	if (!PyArg_ParseTuple(args, "|l", &bytesrequested))
  		return NULL;
  	if (bytesrequested < 0)
--- 519,523 ----
  	if (f->f_fp == NULL)
  		return err_closed();
! 	if (!PyArg_ParseTuple(args, "|l:read", &bytesrequested))
  		return NULL;
  	if (bytesrequested < 0)
***************
*** 733,737 ****
  	if (f->f_fp == NULL)
  		return err_closed();
! 	if (!PyArg_ParseTuple(args, "|i", &n))
  		return NULL;
  	if (n == 0)
--- 733,737 ----
  	if (f->f_fp == NULL)
  		return err_closed();
! 	if (!PyArg_ParseTuple(args, "|i:readline", &n))
  		return NULL;
  	if (n == 0)
***************
*** 762,766 ****
  	if (f->f_fp == NULL)
  		return err_closed();
! 	if (!PyArg_ParseTuple(args, "|l", &sizehint))
  		return NULL;
  	if ((list = PyList_New(0)) == NULL)
--- 762,766 ----
  	if (f->f_fp == NULL)
  		return err_closed();
! 	if (!PyArg_ParseTuple(args, "|l:readlines", &sizehint))
  		return NULL;
  	if ((list = PyList_New(0)) == NULL)

Index: stringobject.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.54
retrieving revision 2.55
diff -C2 -r2.54 -r2.55
*** stringobject.c	2000/01/20 22:32:54	2.54
--- stringobject.c	2000/02/29 13:59:28	2.55
***************
*** 613,617 ****
  	splitcount = 0;
  	maxsplit = 0;
! 	if (!PyArg_ParseTuple(args, "|z#i", &sub, &n, &maxsplit))
  		return NULL;
  	if (sub == NULL)
--- 613,617 ----
  	splitcount = 0;
  	maxsplit = 0;
! 	if (!PyArg_ParseTuple(args, "|z#i:split", &sub, &n, &maxsplit))
  		return NULL;
  	if (sub == NULL)
***************
*** 681,685 ****
  	PyObject *seq;
  
! 	if (!PyArg_ParseTuple(args, "O", &seq))
  		return NULL;
  
--- 681,685 ----
  	PyObject *seq;
  
! 	if (!PyArg_ParseTuple(args, "O:join", &seq))
  		return NULL;
  
***************
*** 770,774 ****
  	int n, i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii", &sub, &n, &i, &last))
  		return -2;
  
--- 770,774 ----
  	int n, i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii:find", &sub, &n, &i, &last))
  		return -2;
  
***************
*** 849,853 ****
  	int i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii", &sub, &n, &i, &last))
  		return -2;
  
--- 849,853 ----
  	int i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii:rfind", &sub, &n, &i, &last))
  		return -2;
  
***************
*** 927,931 ****
  	int len = PyString_GET_SIZE(self), i, j;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 927,931 ----
  	int len = PyString_GET_SIZE(self), i, j;
  
! 	if (!PyArg_ParseTuple(args, ":strip"))
  		return NULL;
  
***************
*** 1011,1015 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
--- 1011,1015 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ":lower"))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
***************
*** 1043,1047 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
--- 1043,1047 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ":upper"))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
***************
*** 1076,1080 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
--- 1076,1080 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ":capitalize"))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
***************
*** 1119,1123 ****
  	int m, r;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii", &sub, &n, &i, &last))
  		return NULL;
  	if (last > len)
--- 1119,1123 ----
  	int m, r;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii:count", &sub, &n, &i, &last))
  		return NULL;
  	if (last > len)
***************
*** 1163,1167 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
--- 1163,1167 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, ":swapcase"))
  		return NULL;
  	new = PyString_FromStringAndSize(NULL, n);
***************
*** 1206,1210 ****
  	int trans_table[256];
  
! 	if (!PyArg_ParseTuple(args, "t#|t#",
  			      &table1, &tablen, &del_table, &dellen))
  		return NULL;
--- 1206,1210 ----
  	int trans_table[256];
  
! 	if (!PyArg_ParseTuple(args, "t#|t#:translate",
  			      &table1, &tablen, &del_table, &dellen))
  		return NULL;
***************
*** 1423,1427 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|i",
  			      &pat, &pat_len, &sub, &sub_len, &count))
  		return NULL;
--- 1423,1427 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|i:replace",
  			      &pat, &pat_len, &sub, &sub_len, &count))
  		return NULL;
***************
*** 1467,1471 ****
  	int end = -1;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii", &prefix, &plen, &start, &end))
  		return NULL;
  
--- 1467,1471 ----
  	int end = -1;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii:startswith", &prefix, &plen, &start, &end))
  		return NULL;
  
***************
*** 1510,1514 ****
  	int lower, upper;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii", &suffix, &plen, &start, &end))
  		return NULL;
  
--- 1510,1514 ----
  	int lower, upper;
  
! 	if (!PyArg_ParseTuple(args, "t#|ii:endswith", &suffix, &plen, &start, &end))
  		return NULL;
  



From guido@cnri.reston.va.us  Tue Feb 29 13:59:32 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 08:59:32 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Python bltinmodule.c,2.148,2.149 import.c,2.128,2.129 sysmodule.c,2.57,2.58
Message-ID: <200002291359.IAA05307@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Python
In directory eric:/projects/python/develop/guido/src/Python

Modified Files:
	bltinmodule.c import.c sysmodule.c 
Log Message:
Massive patch by Skip Montanaro to add ":name" to as many
PyArg_ParseTuple() format string arguments as possible.


Index: bltinmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/bltinmodule.c,v
retrieving revision 2.148
retrieving revision 2.149
diff -C2 -r2.148 -r2.149
*** bltinmodule.c	2000/02/17 15:18:10	2.148
--- bltinmodule.c	2000/02/29 13:59:29	2.149
***************
*** 847,851 ****
  	PyObject *d;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	d = PyEval_GetGlobals();
--- 847,851 ----
  	PyObject *d;
  
! 	if (!PyArg_ParseTuple(args, ":globals"))
  		return NULL;
  	d = PyEval_GetGlobals();
***************
*** 1213,1217 ****
  {
  	PyObject *s;
! 	if (!PyArg_ParseTuple(args, "S", &s))
  		return NULL;
  	Py_INCREF(s);
--- 1213,1217 ----
  {
  	PyObject *s;
! 	if (!PyArg_ParseTuple(args, "S:intern", &s))
  		return NULL;
  	Py_INCREF(s);
***************
*** 1384,1388 ****
  	PyObject *d;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	d = PyEval_GetLocals();
--- 1384,1388 ----
  	PyObject *d;
  
! 	if (!PyArg_ParseTuple(args, ":locals"))
  		return NULL;
  	d = PyEval_GetLocals();
***************
*** 2092,2096 ****
  	int retval = 0;
  
! 	if (!PyArg_ParseTuple(args, "OO", &inst, &cls))
  		return NULL;
  
--- 2092,2096 ----
  	int retval = 0;
  
! 	if (!PyArg_ParseTuple(args, "OO:isinstance", &inst, &cls))
  		return NULL;
  
***************
*** 2151,2155 ****
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "OO", &derived, &cls))
  		return NULL;
  
--- 2151,2155 ----
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "OO:issubclass", &derived, &cls))
  		return NULL;
  

Index: import.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/import.c,v
retrieving revision 2.128
retrieving revision 2.129
diff -C2 -r2.128 -r2.129
*** import.c	1999/12/22 14:09:35	2.128
--- import.c	2000/02/29 13:59:29	2.129
***************
*** 1952,1956 ****
  	char buf[4];
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	buf[0] = (char) ((MAGIC >>  0) & 0xff);
--- 1952,1956 ----
  	char buf[4];
  
! 	if (!PyArg_ParseTuple(args, ":get_magic"))
  		return NULL;
  	buf[0] = (char) ((MAGIC >>  0) & 0xff);
***************
*** 1970,1974 ****
  	struct filedescr *fdp;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	list = PyList_New(0);
--- 1970,1974 ----
  	struct filedescr *fdp;
  
! 	if (!PyArg_ParseTuple(args, ":get_suffixes"))
  		return NULL;
  	list = PyList_New(0);
***************
*** 2033,2037 ****
  	char *name;
  	PyObject *path = NULL;
! 	if (!PyArg_ParseTuple(args, "s|O", &name, &path))
  		return NULL;
  	return call_find_module(name, path);
--- 2033,2037 ----
  	char *name;
  	PyObject *path = NULL;
! 	if (!PyArg_ParseTuple(args, "s|O:find_module", &name, &path))
  		return NULL;
  	return call_find_module(name, path);
***************
*** 2046,2050 ****
  	int ret;
  	PyObject *m;
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	ret = init_builtin(name);
--- 2046,2050 ----
  	int ret;
  	PyObject *m;
! 	if (!PyArg_ParseTuple(args, "s:init_builtin", &name))
  		return NULL;
  	ret = init_builtin(name);
***************
*** 2068,2072 ****
  	int ret;
  	PyObject *m;
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	ret = PyImport_ImportFrozenModule(name);
--- 2068,2072 ----
  	int ret;
  	PyObject *m;
! 	if (!PyArg_ParseTuple(args, "s:init_frozen", &name))
  		return NULL;
  	ret = PyImport_ImportFrozenModule(name);
***************
*** 2089,2093 ****
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	return get_frozen_object(name);
--- 2089,2093 ----
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "s:get_frozen_object", &name))
  		return NULL;
  	return get_frozen_object(name);
***************
*** 2100,2104 ****
  {
  	char *name;
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	return PyInt_FromLong(is_builtin(name));
--- 2100,2104 ----
  {
  	char *name;
! 	if (!PyArg_ParseTuple(args, "s:is_builtin", &name))
  		return NULL;
  	return PyInt_FromLong(is_builtin(name));
***************
*** 2112,2116 ****
  	char *name;
  	struct _frozen *p;
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	p = find_frozen(name);
--- 2112,2116 ----
  	char *name;
  	struct _frozen *p;
! 	if (!PyArg_ParseTuple(args, "s:is_frozen", &name))
  		return NULL;
  	p = find_frozen(name);
***************
*** 2149,2153 ****
  	PyObject *m;
  	FILE *fp;
! 	if (!PyArg_ParseTuple(args, "ss|O!", &name, &pathname,
  			      &PyFile_Type, &fob))
  		return NULL;
--- 2149,2153 ----
  	PyObject *m;
  	FILE *fp;
! 	if (!PyArg_ParseTuple(args, "ss|O!:load_compiled", &name, &pathname,
  			      &PyFile_Type, &fob))
  		return NULL;
***************
*** 2173,2177 ****
  	PyObject *m;
  	FILE *fp = NULL;
! 	if (!PyArg_ParseTuple(args, "ss|O!", &name, &pathname,
  			      &PyFile_Type, &fob))
  		return NULL;
--- 2173,2177 ----
  	PyObject *m;
  	FILE *fp = NULL;
! 	if (!PyArg_ParseTuple(args, "ss|O!:load_dynamic", &name, &pathname,
  			      &PyFile_Type, &fob))
  		return NULL;
***************
*** 2197,2201 ****
  	PyObject *m;
  	FILE *fp;
! 	if (!PyArg_ParseTuple(args, "ss|O!", &name, &pathname,
  			      &PyFile_Type, &fob))
  		return NULL;
--- 2197,2201 ----
  	PyObject *m;
  	FILE *fp;
! 	if (!PyArg_ParseTuple(args, "ss|O!:load_source", &name, &pathname,
  			      &PyFile_Type, &fob))
  		return NULL;
***************
*** 2219,2223 ****
  	PyObject *m;
  
! 	if (!PyArg_ParseTuple(args, "ss", &name, &pathname))
  		return NULL;
  	m = PyMac_LoadResourceModule(name, pathname);
--- 2219,2223 ----
  	PyObject *m;
  
! 	if (!PyArg_ParseTuple(args, "ss:load_resource", &name, &pathname))
  		return NULL;
  	m = PyMac_LoadResourceModule(name, pathname);
***************
*** 2239,2243 ****
  	FILE *fp;
  
! 	if (!PyArg_ParseTuple(args, "sOs(ssi)",
  			      &name, &fob, &pathname,
  			      &suffix, &mode, &type))
--- 2239,2243 ----
  	FILE *fp;
  
! 	if (!PyArg_ParseTuple(args, "sOs(ssi):load_module",
  			      &name, &fob, &pathname,
  			      &suffix, &mode, &type))
***************
*** 2270,2274 ****
  	char *name;
  	char *pathname;
! 	if (!PyArg_ParseTuple(args, "ss", &name, &pathname))
  		return NULL;
  	return load_package(name, pathname);
--- 2270,2274 ----
  	char *name;
  	char *pathname;
! 	if (!PyArg_ParseTuple(args, "ss:load_package", &name, &pathname))
  		return NULL;
  	return load_package(name, pathname);
***************
*** 2281,2285 ****
  {
  	char *name;
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	return PyModule_New(name);
--- 2281,2285 ----
  {
  	char *name;
! 	if (!PyArg_ParseTuple(args, "s:new_module", &name))
  		return NULL;
  	return PyModule_New(name);

Index: sysmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Python/sysmodule.c,v
retrieving revision 2.57
retrieving revision 2.58
diff -C2 -r2.57 -r2.58
*** sysmodule.c	1999/10/05 22:17:41	2.57
--- sysmodule.c	2000/02/29 13:59:29	2.58
***************
*** 193,197 ****
  {
  	PyThreadState *tstate = PyThreadState_Get();
! 	if (!PyArg_ParseTuple(args, "i", &tstate->interp->checkinterval))
  		return NULL;
  	Py_INCREF(Py_None);
--- 193,197 ----
  {
  	PyThreadState *tstate = PyThreadState_Get();
! 	if (!PyArg_ParseTuple(args, "i:setcheckinterval", &tstate->interp->checkinterval))
  		return NULL;
  	Py_INCREF(Py_None);



From guido@cnri.reston.va.us  Tue Feb 29 14:00:00 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 09:00:00 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules _localemodule.c,2.6,2.7 _tkinter.c,1.89,1.90 almodule.c,1.22,1.23 audioop.c,1.34,1.35 binascii.c,2.18,2.19 bsddbmodule.c,1.16,1.17 cPickle.c,2.37,2.38 cStringIO.c,2.17,2.18 cdmodule.c,1.17,1.18 dbmmodule.c,2.15,2.16 fcntlmodule.c,2.18,2.19 gdbmmodule.c,2.20,2.21 md5module.c,2.13,2.14 newmodule.c,2.18,2.19 pcremodule.c,2.16,2.17 puremodule.c,2.1,2.2 readline.c,2.15,2.16 regexmodule.c,1.32,1.33 resource.c,2.9,2.10 rotormodule.c,2.21,2.22 selectmodule.c,2.30,2.31 shamodule.c,2.3,2.4 socketmodule.c,1.95,1.96 soundex.c,2.6,2.7 stropmodule.c,2.60,2.61 structmodule.c,2.29,2.30 syslogmodule.c,2.12,2.13 threadmodule.c,2.29,2.30 timemodule.c,2.78,2.79 xxmodule.c,2.14,2.15 zlibmodule.c,2.29,2.30
Message-ID: <200002291400.JAA05381@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/src/Modules

Modified Files:
	_localemodule.c _tkinter.c almodule.c audioop.c binascii.c 
	bsddbmodule.c cPickle.c cStringIO.c cdmodule.c dbmmodule.c 
	fcntlmodule.c gdbmmodule.c md5module.c newmodule.c 
	pcremodule.c puremodule.c readline.c regexmodule.c resource.c 
	rotormodule.c selectmodule.c shamodule.c socketmodule.c 
	soundex.c stropmodule.c structmodule.c syslogmodule.c 
	threadmodule.c timemodule.c xxmodule.c zlibmodule.c 
Log Message:
Massive patch by Skip Montanaro to add ":name" to as many
PyArg_ParseTuple() format string arguments as possible.


Index: _localemodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/_localemodule.c,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -r2.6 -r2.7
*** _localemodule.c	1998/12/04 18:49:34	2.6
--- _localemodule.c	2000/02/29 13:59:22	2.7
***************
*** 136,140 ****
    PyObject *result_object;
    struct lconv *lc;
!   if(!PyArg_ParseTuple(args,"i|z",&category,&locale))return 0;
    if(locale){
      /* set locale */
--- 136,140 ----
    PyObject *result_object;
    struct lconv *lc;
!   if(!PyArg_ParseTuple(args,"i|z:setlocale",&category,&locale))return 0;
    if(locale){
      /* set locale */
***************
*** 267,271 ****
  {
    char *s1,*s2;
!   if(!PyArg_ParseTuple(args,"ss",&s1,&s2))
       return NULL;
    return PyInt_FromLong(strcoll(s1,s2));
--- 267,271 ----
  {
    char *s1,*s2;
!   if(!PyArg_ParseTuple(args,"ss:strcoll",&s1,&s2))
       return NULL;
    return PyInt_FromLong(strcoll(s1,s2));
***************
*** 284,288 ****
    int n1,n2;
    PyObject *result;
!   if(!PyArg_ParseTuple(args,"s",&s))
       return NULL;
    /* assume no change in size, first */
--- 284,288 ----
    int n1,n2;
    PyObject *result;
!   if(!PyArg_ParseTuple(args,"s:strxfrm",&s))
       return NULL;
    /* assume no change in size, first */

Index: _tkinter.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -r1.89 -r1.90
*** _tkinter.c	1999/11/05 18:09:56	1.89
--- _tkinter.c	2000/02/29 13:59:22	1.90
***************
*** 698,702 ****
  	int err;
    
! 	if (!PyArg_ParseTuple(args, "s", &script))
  		return NULL;
  
--- 698,702 ----
  	int err;
    
! 	if (!PyArg_ParseTuple(args, "s:eval", &script))
  		return NULL;
  
***************
*** 721,725 ****
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s", &script))
  		return NULL;
  
--- 721,725 ----
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s:globaleval", &script))
  		return NULL;
  
***************
*** 744,748 ****
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s", &fileName))
  		return NULL;
  
--- 744,748 ----
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s:evalfile", &fileName))
  		return NULL;
  
***************
*** 789,793 ****
  	char *msg;
  
! 	if (!PyArg_ParseTuple(args, "s", &msg))
  		return NULL;
  	ENTER_TCL
--- 789,793 ----
  	char *msg;
  
! 	if (!PyArg_ParseTuple(args, "s:adderrorinfo", &msg))
  		return NULL;
  	ENTER_TCL
***************
*** 817,821 ****
  		return NULL;
  
! 	if (PyArg_ParseTuple(args, "sO", &name1, &newValue)) {
  		/* XXX Merge? */
  		s = AsString(newValue, tmp);
--- 817,821 ----
  		return NULL;
  
! 	if (PyArg_ParseTuple(args, "sO:setvar", &name1, &newValue)) {
  		/* XXX Merge? */
  		s = AsString(newValue, tmp);
***************
*** 826,830 ****
  	else {
  		PyErr_Clear();
! 		if (PyArg_ParseTuple(args, "ssO", &name1, &name2, &newValue)) {
  			s = AsString (newValue, tmp);
  			ENTER_TCL
--- 826,830 ----
  	else {
  		PyErr_Clear();
! 		if (PyArg_ParseTuple(args, "ssO:setvar", &name1, &name2, &newValue)) {
  			s = AsString (newValue, tmp);
  			ENTER_TCL
***************
*** 874,878 ****
  	PyObject *res = NULL;
  
! 	if (!PyArg_ParseTuple(args, "s|s", &name1, &name2))
  		return NULL;
  	ENTER_TCL
--- 874,878 ----
  	PyObject *res = NULL;
  
! 	if (!PyArg_ParseTuple(args, "s|s:getvar", &name1, &name2))
  		return NULL;
  	ENTER_TCL
***************
*** 920,924 ****
  	int code;
  
! 	if (!PyArg_ParseTuple(args, "s|s", &name1, &name2))
  		return NULL;
  	ENTER_TCL
--- 920,924 ----
  	int code;
  
! 	if (!PyArg_ParseTuple(args, "s|s:unsetvar", &name1, &name2))
  		return NULL;
  	ENTER_TCL
***************
*** 968,972 ****
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	if (Tcl_GetInt(Tkapp_Interp(self), s, &v) == TCL_ERROR)
--- 968,972 ----
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s:getint", &s))
  		return NULL;
  	if (Tcl_GetInt(Tkapp_Interp(self), s, &v) == TCL_ERROR)
***************
*** 983,987 ****
  	double v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	if (Tcl_GetDouble(Tkapp_Interp(self), s, &v) == TCL_ERROR)
--- 983,987 ----
  	double v;
  
! 	if (!PyArg_ParseTuple(args, "s:getdouble", &s))
  		return NULL;
  	if (Tcl_GetDouble(Tkapp_Interp(self), s, &v) == TCL_ERROR)
***************
*** 998,1002 ****
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	if (Tcl_GetBoolean(Tkapp_Interp(self), s, &v) == TCL_ERROR)
--- 998,1002 ----
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s:getboolean", &s))
  		return NULL;
  	if (Tcl_GetBoolean(Tkapp_Interp(self), s, &v) == TCL_ERROR)
***************
*** 1014,1018 ****
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	ENTER_TCL
--- 1014,1018 ----
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "s:exprstring", &s))
  		return NULL;
  	ENTER_TCL
***************
*** 1037,1041 ****
  	long v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	ENTER_TCL
--- 1037,1041 ----
  	long v;
  
! 	if (!PyArg_ParseTuple(args, "s:exprlong", &s))
  		return NULL;
  	ENTER_TCL
***************
*** 1060,1064 ****
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	PyFPE_START_PROTECT("Tkapp_ExprDouble", return 0)
--- 1060,1064 ----
  	int retval;
  
! 	if (!PyArg_ParseTuple(args, "s:exprdouble", &s))
  		return NULL;
  	PyFPE_START_PROTECT("Tkapp_ExprDouble", return 0)
***************
*** 1085,1089 ****
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	ENTER_TCL
--- 1085,1089 ----
  	int v;
  
! 	if (!PyArg_ParseTuple(args, "s:exprboolean", &s))
  		return NULL;
  	ENTER_TCL
***************
*** 1111,1115 ****
  	int i;
  
! 	if (!PyArg_ParseTuple(args, "s", &list))
  		return NULL;
  
--- 1111,1115 ----
  	int i;
  
! 	if (!PyArg_ParseTuple(args, "s:splitlist", &list))
  		return NULL;
  
***************
*** 1141,1145 ****
  	char *list;
  
! 	if (!PyArg_ParseTuple(args, "s", &list))
  		return NULL;
  	return Split(list);
--- 1141,1145 ----
  	char *list;
  
! 	if (!PyArg_ParseTuple(args, "s:split", &list))
  		return NULL;
  	return Split(list);
***************
*** 1262,1266 ****
  	Tcl_Command err;
  
! 	if (!PyArg_ParseTuple(args, "sO", &cmdName, &func))
  		return NULL;
  	if (!PyCallable_Check(func)) {
--- 1262,1266 ----
  	Tcl_Command err;
  
! 	if (!PyArg_ParseTuple(args, "sO:createcommand", &cmdName, &func))
  		return NULL;
  	if (!PyCallable_Check(func)) {
***************
*** 1301,1305 ****
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s", &cmdName))
  		return NULL;
  	ENTER_TCL
--- 1301,1305 ----
  	int err;
  
! 	if (!PyArg_ParseTuple(args, "s:deletecommand", &cmdName))
  		return NULL;
  	ENTER_TCL
***************
*** 1444,1448 ****
  	FHANDLE tfile;
  
! 	if (!PyArg_ParseTuple(args, "OiO", &file, &mask, &func))
  		return NULL;
  	id = GetFileNo(file);
--- 1444,1448 ----
  	FHANDLE tfile;
  
! 	if (!PyArg_ParseTuple(args, "OiO:createfilehandler", &file, &mask, &func))
  		return NULL;
  	id = GetFileNo(file);
***************
*** 1477,1481 ****
  	FHANDLE tfile;
    
! 	if (!PyArg_ParseTuple(args, "O", &file))
  		return NULL;
  	id = GetFileNo(file);
--- 1477,1481 ----
  	FHANDLE tfile;
    
! 	if (!PyArg_ParseTuple(args, "O:deletefilehandler", &file))
  		return NULL;
  	id = GetFileNo(file);
***************
*** 1514,1518 ****
  	PyObject *func = v->func;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if (v->token != NULL) {
--- 1514,1518 ----
  	PyObject *func = v->func;
  
! 	if (!PyArg_ParseTuple(args, ":deletetimerhandler"))
  		return NULL;
  	if (v->token != NULL) {
***************
*** 1647,1651 ****
  	TkttObject *v;
  
! 	if (!PyArg_ParseTuple(args, "iO", &milliseconds, &func))
  		return NULL;
  	if (!PyCallable_Check(func)) {
--- 1647,1651 ----
  	TkttObject *v;
  
! 	if (!PyArg_ParseTuple(args, "iO:createtimerhandler", &milliseconds, &func))
  		return NULL;
  	if (!PyCallable_Check(func)) {
***************
*** 1673,1677 ****
  #endif
  
! 	if (!PyArg_ParseTuple(args, "|i", &threshold))
  		return NULL;
  
--- 1673,1677 ----
  #endif
  
! 	if (!PyArg_ParseTuple(args, "|i:mainloop", &threshold))
  		return NULL;
  
***************
*** 1722,1726 ****
  	int rv;
  
! 	if (!PyArg_ParseTuple(args, "|i", &flags))
  		return NULL;
  
--- 1722,1726 ----
  	int rv;
  
! 	if (!PyArg_ParseTuple(args, "|i:dooneevent", &flags))
  		return NULL;
  
***************
*** 1737,1741 ****
  {
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 1737,1741 ----
  {
  
! 	if (!PyArg_ParseTuple(args, ":quit"))
  		return NULL;
  
***************
*** 1751,1755 ****
  {
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 1751,1755 ----
  {
  
! 	if (!PyArg_ParseTuple(args, ":interpaddr"))
  		return NULL;
  
***************
*** 1863,1867 ****
  	className = "Tk";
    
! 	if (!PyArg_ParseTuple(args, "|zssi",
  			      &screenName, &baseName, &className,
  			      &interactive))
--- 1863,1867 ----
  	className = "Tk";
    
! 	if (!PyArg_ParseTuple(args, "|zssi:create",
  			      &screenName, &baseName, &className,
  			      &interactive))

Index: almodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/almodule.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** almodule.c	1999/12/10 15:12:11	1.22
--- almodule.c	2000/02/29 13:59:22	1.23
***************
*** 282,286 ****
  	int par;
  
! 	if (!PyArg_ParseTuple(args, "i", &par))
  		return NULL;
  
--- 282,286 ----
  	int par;
  
! 	if (!PyArg_ParseTuple(args, "i:SetConfig", &par))
  		return NULL;
  
***************
*** 300,304 ****
  	int par;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	
--- 300,304 ----
  	int par;
  
! 	if (!PyArg_ParseTuple(args, ":GetConfig"))
  		return NULL;
  	
***************
*** 398,402 ****
  	double maximum_value;
  
! 	if (!PyArg_ParseTuple(args, "d", &maximum_value))
  		return NULL;
  	if (alSetFloatMax(self->config, maximum_value) < 0)
--- 398,402 ----
  	double maximum_value;
  
! 	if (!PyArg_ParseTuple(args, "d:SetFloatMax", &maximum_value))
  		return NULL;
  	if (alSetFloatMax(self->config, maximum_value) < 0)
***************
*** 418,422 ****
  	double maximum_value;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((maximum_value = alGetFloatMax(self->config)) == 0)
--- 418,422 ----
  	double maximum_value;
  
! 	if (!PyArg_ParseTuple(args, ":GetFloatMax"))
  		return NULL;
  	if ((maximum_value = alGetFloatMax(self->config)) == 0)
***************
*** 487,491 ****
  	long par;
  
! 	if (!PyArg_ParseTuple(args, "l", &par))
  		return NULL;
  
--- 487,491 ----
  	long par;
  
! 	if (!PyArg_ParseTuple(args, "l:SetConfig", &par))
  		return NULL;
  
***************
*** 505,509 ****
  	long par;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	
--- 505,509 ----
  	long par;
  
! 	if (!PyArg_ParseTuple(args, ":GetConfig"))
  		return NULL;
  	
***************
*** 587,591 ****
  	double arg;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return 0;
  	if ((arg = ALgetfloatmax(self->config)) == 0)
--- 587,591 ----
  	double arg;
  
! 	if (!PyArg_ParseTuple(args, ":GetFloatMax"))
  		return 0;
  	if ((arg = ALgetfloatmax(self->config)) == 0)
***************
*** 601,605 ****
  	double arg;
  
! 	if (!PyArg_ParseTuple(args, "d", &arg))
  		return 0;
  	if (ALsetfloatmax(self->config, arg) == -1)
--- 601,605 ----
  	double arg;
  
! 	if (!PyArg_ParseTuple(args, "d:SetFloatMax", &arg))
  		return 0;
  	if (ALsetfloatmax(self->config, arg) == -1)
***************
*** 724,728 ****
  {
  	alcobject *config;
! 	if (!PyArg_ParseTuple(args, "O!", &Alctype, &config))
  		return NULL;
  	if (alSetConfig(self->port, config->config) < 0)
--- 724,728 ----
  {
  	alcobject *config;
! 	if (!PyArg_ParseTuple(args, "O!:SetConfig", &Alctype, &config))
  		return NULL;
  	if (alSetConfig(self->port, config->config) < 0)
***************
*** 743,747 ****
  {
  	ALconfig config;
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((config = alGetConfig(self->port)) == NULL)
--- 743,747 ----
  {
  	ALconfig config;
! 	if (!PyArg_ParseTuple(args, ":GetConfig"))
  		return NULL;
  	if ((config = alGetConfig(self->port)) == NULL)
***************
*** 762,766 ****
  	int resource;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((resource = alGetResource(self->port)) == 0)
--- 762,766 ----
  	int resource;
  
! 	if (!PyArg_ParseTuple(args, ":GetResource"))
  		return NULL;
  	if ((resource = alGetResource(self->port)) == 0)
***************
*** 781,785 ****
  	int fd;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 781,785 ----
  	int fd;
  
! 	if (!PyArg_ParseTuple(args, ":GetFD"))
  		return NULL;
  
***************
*** 802,806 ****
  	int filled;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((filled = alGetFilled(self->port)) < 0)
--- 802,806 ----
  	int filled;
  
! 	if (!PyArg_ParseTuple(args, ":GetFilled"))
  		return NULL;
  	if ((filled = alGetFilled(self->port)) < 0)
***************
*** 821,825 ****
  	int fillable;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((fillable = alGetFillable(self->port)) < 0)
--- 821,825 ----
  	int fillable;
  
! 	if (!PyArg_ParseTuple(args, ":GetFillable"))
  		return NULL;
  	if ((fillable = alGetFillable(self->port)) < 0)
***************
*** 845,849 ****
  	ALconfig c;
  
! 	if (!PyArg_ParseTuple(args, "i", &framecount))
  		return NULL;
  	if (framecount < 0) {
--- 845,849 ----
  	ALconfig c;
  
! 	if (!PyArg_ParseTuple(args, "i:ReadFrames", &framecount))
  		return NULL;
  	if (framecount < 0) {
***************
*** 911,915 ****
  	int framecount;
  
! 	if (!PyArg_ParseTuple(args, "i", &framecount))
  		return NULL;
  
--- 911,915 ----
  	int framecount;
  
! 	if (!PyArg_ParseTuple(args, "i:DiscardFrames", &framecount))
  		return NULL;
  
***************
*** 936,940 ****
  	int framecount;
  
! 	if (!PyArg_ParseTuple(args, "i", &framecount))
  		return NULL;
  
--- 936,940 ----
  	int framecount;
  
! 	if (!PyArg_ParseTuple(args, "i:ZeroFrames", &framecount))
  		return NULL;
  
***************
*** 964,968 ****
  	int fillpoint;
  
! 	if (!PyArg_ParseTuple(args, "i", &fillpoint))
  		return NULL;
  
--- 964,968 ----
  	int fillpoint;
  
! 	if (!PyArg_ParseTuple(args, "i:SetFillPoint", &fillpoint))
  		return NULL;
  
***************
*** 986,990 ****
  	int fillpoint;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 986,990 ----
  	int fillpoint;
  
! 	if (!PyArg_ParseTuple(args, ":GetFillPoint"))
  		return NULL;
  
***************
*** 1007,1011 ****
  	stamp_t fnum;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 1007,1011 ----
  	stamp_t fnum;
  
! 	if (!PyArg_ParseTuple(args, ":GetFrameNumber"))
  		return NULL;
  
***************
*** 1029,1033 ****
  	PyObject *ret, *v0, *v1;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if (alGetFrameTime(self->port, &fnum, &time) < 0)
--- 1029,1033 ----
  	PyObject *ret, *v0, *v1;
  
! 	if (!PyArg_ParseTuple(args, ":GetFrameTime"))
  		return NULL;
  	if (alGetFrameTime(self->port, &fnum, &time) < 0)
***************
*** 1061,1065 ****
  	ALconfig c;
  
! 	if (!PyArg_ParseTuple(args, "s#", &samples, &length))
  		return NULL;
  	c = alGetConfig(self->port);
--- 1061,1065 ----
  	ALconfig c;
  
! 	if (!PyArg_ParseTuple(args, "s#:WriteFrames", &samples, &length))
  		return NULL;
  	c = alGetConfig(self->port);
***************
*** 1124,1128 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if (alClosePort(self->port) < 0)
--- 1124,1128 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":ClosePort"))
  		return NULL;
  	if (alClosePort(self->port) < 0)
***************
*** 1141,1145 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if (ALcloseport(self->port) < 0)
--- 1141,1145 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":ClosePort"))
  		return NULL;
  	if (ALcloseport(self->port) < 0)
***************
*** 1151,1155 ****
  
  static PyObject *
! alp_getfd (self, args)
  	alpobject *self;
  	PyObject *args;
--- 1151,1155 ----
  
  static PyObject *
! alp_getfd(self, args)
  	alpobject *self;
  	PyObject *args;
***************
*** 1157,1161 ****
  	int fd;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((fd = ALgetfd(self-> port)) == -1)
--- 1157,1161 ----
  	int fd;
  
! 	if (!PyArg_ParseTuple(args, ":GetFD"))
  		return NULL;
  	if ((fd = ALgetfd(self-> port)) == -1)
***************
*** 1171,1175 ****
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((count = ALgetfilled(self-> port)) == -1)
--- 1171,1175 ----
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ":GetFilled"))
  		return NULL;
  	if ((count = ALgetfilled(self-> port)) == -1)
***************
*** 1185,1189 ****
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((count = ALgetfillable(self-> port)) == -1)
--- 1185,1189 ----
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ":GetFillable"))
  		return NULL;
  	if ((count = ALgetfillable(self-> port)) == -1)
***************
*** 1203,1207 ****
  	int ret;
  
! 	if (!PyArg_ParseTuple(args, "l", &count))
  		return NULL;
  
--- 1203,1207 ----
  	int ret;
  
! 	if (!PyArg_ParseTuple(args, "l:readsamps", &count))
  		return NULL;
  
***************
*** 1249,1253 ****
  	int ret;
  
! 	if (!PyArg_ParseTuple(args, "s#", &buf, &size))
  		return NULL;
  
--- 1249,1253 ----
  	int ret;
  
! 	if (!PyArg_ParseTuple(args, "s#:writesamps", &buf, &size))
  		return NULL;
  
***************
*** 1282,1286 ****
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((count = ALgetfillpoint(self->port)) == -1)
--- 1282,1286 ----
  	long count;
  
! 	if (!PyArg_ParseTuple(args, ":GetFillPoint"))
  		return NULL;
  	if ((count = ALgetfillpoint(self->port)) == -1)
***************
*** 1290,1294 ****
  
  static PyObject *
! alp_setfillpoint (self, args)
  	alpobject *self;
  	PyObject *args;
--- 1290,1294 ----
  
  static PyObject *
! alp_setfillpoint(self, args)
  	alpobject *self;
  	PyObject *args;
***************
*** 1296,1300 ****
  	long count;
  
! 	if (!PyArg_ParseTuple(args, "l", &count))
  		return NULL;
  	if (ALsetfillpoint(self->port, count) == -1)
--- 1296,1300 ----
  	long count;
  
! 	if (!PyArg_ParseTuple(args, "l:SetFillPoint", &count))
  		return NULL;
  	if (ALsetfillpoint(self->port, count) == -1)
***************
*** 1311,1315 ****
  	alcobject *config;
  
! 	if (!PyArg_ParseTuple(args, "O!", &Alctype, &config))
  		return NULL;
  	if (ALsetconfig(self->port, config->config) == -1)
--- 1311,1315 ----
  	alcobject *config;
  
! 	if (!PyArg_ParseTuple(args, "O!:SetConfig", &Alctype, &config))
  		return NULL;
  	if (ALsetconfig(self->port, config->config) == -1)
***************
*** 1326,1330 ****
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	config = ALgetconfig(self->port);
--- 1326,1330 ----
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ":GetConfig"))
  		return NULL;
  	config = ALgetconfig(self->port);
***************
*** 1505,1509 ****
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((config = alNewConfig()) == NULL)
--- 1505,1509 ----
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ":NewConfig"))
  		return NULL;
  	if ((config = alNewConfig()) == NULL)
***************
*** 1525,1529 ****
  	alcobject *config = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ss|O!", &name, &dir, &Alctype, &config))
  		return NULL;
  	if ((port = alOpenPort(name, dir, config ? config->config : NULL)) == NULL)
--- 1525,1529 ----
  	alcobject *config = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ss|O!:OpenPort", &name, &dir, &Alctype, &config))
  		return NULL;
  	if ((port = alOpenPort(name, dir, config ? config->config : NULL)) == NULL)
***************
*** 1546,1550 ****
  	PyObject *propobj = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ii|O!", &source, &dest, &PyList_Type, &propobj))
  		return NULL;
  	if (propobj != NULL) {
--- 1546,1550 ----
  	PyObject *propobj = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ii|O!:Connect", &source, &dest, &PyList_Type, &propobj))
  		return NULL;
  	if (propobj != NULL) {
***************
*** 1585,1589 ****
  	int res;
  
! 	if (!PyArg_ParseTuple(args, "i", &res))
  		return NULL;
  	if (alDisconnect(res) < 0)
--- 1585,1589 ----
  	int res;
  
! 	if (!PyArg_ParseTuple(args, "i:Disconnect", &res))
  		return NULL;
  	if (alDisconnect(res) < 0)
***************
*** 1608,1612 ****
  	ALparamInfo *pinfo;
  
! 	if (!PyArg_ParseTuple(args, "iO!", &resource, &PyList_Type, &pvslist))
  		return NULL;
  	npvs = PyList_Size(pvslist);
--- 1608,1612 ----
  	ALparamInfo *pinfo;
  
! 	if (!PyArg_ParseTuple(args, "iO!:GetParams", &resource, &PyList_Type, &pvslist))
  		return NULL;
  	npvs = PyList_Size(pvslist);
***************
*** 1754,1758 ****
  	int npvs, i;
  
! 	if (!PyArg_ParseTuple(args, "iO!", &resource, &PyList_Type, &pvslist))
  		return NULL;
  	npvs = python2params(resource, -1, pvslist, &pvs, &pinfo);
--- 1754,1758 ----
  	int npvs, i;
  
! 	if (!PyArg_ParseTuple(args, "iO!:SetParams", &resource, &PyList_Type, &pvslist))
  		return NULL;
  	npvs = python2params(resource, -1, pvslist, &pvs, &pinfo);
***************
*** 1805,1809 ****
  	PyObject *res = NULL, *item;
  
! 	if (!PyArg_ParseTuple(args, "ii|O!", &resource, &param,
  			      &PyList_Type, &qualobj))
  		return NULL;
--- 1805,1809 ----
  	PyObject *res = NULL, *item;
  
! 	if (!PyArg_ParseTuple(args, "ii|O!:QueryValues", &resource, &param,
  			      &PyList_Type, &qualobj))
  		return NULL;
***************
*** 1882,1886 ****
  	PyObject *v, *item;;
  
! 	if (!PyArg_ParseTuple(args, "ii", &res, &param))
  		return NULL;
  	if (alGetParamInfo(res, param, &pinfo) < 0)
--- 1882,1886 ----
  	PyObject *v, *item;;
  
! 	if (!PyArg_ParseTuple(args, "ii:GetParamInfo", &res, &param))
  		return NULL;
  	if (alGetParamInfo(res, param, &pinfo) < 0)
***************
*** 1966,1970 ****
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "isi", &start_res, &name, &type))
  		return NULL;
  	if ((res = alGetResourceByName(start_res, name, type)) == 0)
--- 1966,1970 ----
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "isi:GetResourceByName", &start_res, &name, &type))
  		return NULL;
  	if ((res = alGetResourceByName(start_res, name, type)) == 0)
***************
*** 1984,1988 ****
  	int type, subtype;
  
! 	if (!PyArg_ParseTuple(args, "ii", &type, &subtype))
  		return NULL;
  	return PyInt_FromLong((long) alIsSubtype(type, subtype));
--- 1984,1988 ----
  	int type, subtype;
  
! 	if (!PyArg_ParseTuple(args, "ii:IsSubtype", &type, &subtype))
  		return NULL;
  	return PyInt_FromLong((long) alIsSubtype(type, subtype));
***************
*** 1999,2003 ****
  {
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	Py_INCREF(Py_None);
--- 1999,2003 ----
  {
  
! 	if (!PyArg_ParseTuple(args, ":SetErrorHandler"))
  		return NULL;
  	Py_INCREF(Py_None);
***************
*** 2017,2021 ****
  	alcobject *config = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ss|O!", &name, &dir, &Alctype, &config))
  		return NULL;
  	if ((port = ALopenport(name, dir, config ? config->config : NULL)) == NULL)
--- 2017,2021 ----
  	alcobject *config = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ss|O!:OpenPort", &name, &dir, &Alctype, &config))
  		return NULL;
  	if ((port = ALopenport(name, dir, config ? config->config : NULL)) == NULL)
***************
*** 2030,2034 ****
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	if ((config = ALnewconfig ()) == NULL)
--- 2030,2034 ----
  	ALconfig config;
  
! 	if (!PyArg_ParseTuple(args, ":NewConfig"))
  		return NULL;
  	if ((config = ALnewconfig ()) == NULL)
***************
*** 2048,2052 ****
  	int i;
  
! 	if (!PyArg_ParseTuple(args, "l", &device))
  		return NULL;
  	if ((length = ALqueryparams(device, PVdummy, 2L)) == -1)
--- 2048,2052 ----
  	int i;
  
! 	if (!PyArg_ParseTuple(args, "l:queryparams", &device))
  		return NULL;
  	if ((length = ALqueryparams(device, PVdummy, 2L)) == -1)
***************
*** 2128,2132 ****
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "ll", &device, &descriptor))
  		return NULL;
  	if ((name = ALgetname(device, descriptor)) == NULL)
--- 2128,2132 ----
  	char *name;
  
! 	if (!PyArg_ParseTuple(args, "ll:getname", &device, &descriptor))
  		return NULL;
  	if ((name = ALgetname(device, descriptor)) == NULL)
***************
*** 2141,2145 ****
  	long device, descriptor, value;
  
! 	if (!PyArg_ParseTuple(args, "ll", &device, &descriptor))
  		return NULL;
  	if ((value = ALgetdefault(device, descriptor)) == -1)
--- 2141,2145 ----
  	long device, descriptor, value;
  
! 	if (!PyArg_ParseTuple(args, "ll:getdefault", &device, &descriptor))
  		return NULL;
  	if ((value = ALgetdefault(device, descriptor)) == -1)
***************
*** 2154,2158 ****
  	long device, descriptor, min, max;
  
! 	if (!PyArg_ParseTuple(args, "ll", &device, &descriptor))
  		return NULL;
  	min = -1;
--- 2154,2158 ----
  	long device, descriptor, min, max;
  
! 	if (!PyArg_ParseTuple(args, "ll:getminmax", &device, &descriptor))
  		return NULL;
  	min = -1;

Index: audioop.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/audioop.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** audioop.c	1999/09/07 14:24:05	1.34
--- audioop.c	2000/02/29 13:59:22	1.35
***************
*** 982,986 ****
  	weightA = 1;
  	weightB = 0;
! 	if (!PyArg_ParseTuple(args, "s#iiiiO|ii", &cp, &len, &size, &nchannels,
  			      &inrate, &outrate, &state, &weightA, &weightB))
  		return NULL;
--- 982,986 ----
  	weightA = 1;
  	weightB = 0;
! 	if (!PyArg_ParseTuple(args, "s#iiiiO|ii:ratecv", &cp, &len, &size, &nchannels,
  			      &inrate, &outrate, &state, &weightA, &weightB))
  		return NULL;
***************
*** 1035,1039 ****
  		for (chan = 0; chan < nchannels; chan++) {
  			if (!PyArg_ParseTuple(PyTuple_GetItem(samps, chan),
! 					      "ii",&prev_i[chan],&cur_i[chan]))
  				goto exit;
  		}
--- 1035,1039 ----
  		for (chan = 0; chan < nchannels; chan++) {
  			if (!PyArg_ParseTuple(PyTuple_GetItem(samps, chan),
! 					      "ii:ratecv",&prev_i[chan],&cur_i[chan]))
  				goto exit;
  		}

Index: binascii.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/binascii.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** binascii.c	2000/02/16 21:11:52	2.18
--- binascii.c	2000/02/29 13:59:22	2.19
***************
*** 214,218 ****
  	int ascii_len, bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "t#", &ascii_data, &ascii_len) )
  		return NULL;
  
--- 214,218 ----
  	int ascii_len, bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "t#:a2b_uu", &ascii_data, &ascii_len) )
  		return NULL;
  
***************
*** 291,295 ****
  	int bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#", &bin_data, &bin_len) )
  		return NULL;
  	if ( bin_len > 45 ) {
--- 291,295 ----
  	int bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#:b2a_uu", &bin_data, &bin_len) )
  		return NULL;
  	if ( bin_len > 45 ) {
***************
*** 373,377 ****
  	int quad_pos = 0;
  	
! 	if ( !PyArg_ParseTuple(args, "t#", &ascii_data, &ascii_len) )
  		return NULL;
  
--- 373,377 ----
  	int quad_pos = 0;
  	
! 	if ( !PyArg_ParseTuple(args, "t#:a2b_base64", &ascii_data, &ascii_len) )
  		return NULL;
  
***************
*** 457,461 ****
  	int bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#", &bin_data, &bin_len) )
  		return NULL;
  	if ( bin_len > BASE64_MAXBIN ) {
--- 457,461 ----
  	int bin_len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#:b2a_base64", &bin_data, &bin_len) )
  		return NULL;
  	if ( bin_len > BASE64_MAXBIN ) {
***************
*** 511,515 ****
  	int done = 0;
  	
! 	if ( !PyArg_ParseTuple(args, "t#", &ascii_data, &len) )
  		return NULL;
  
--- 511,515 ----
  	int done = 0;
  	
! 	if ( !PyArg_ParseTuple(args, "t#:a2b_hqx", &ascii_data, &len) )
  		return NULL;
  
***************
*** 574,578 ****
  	int in, inend, len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#", &in_data, &len) )
  		return NULL;
  
--- 574,578 ----
  	int in, inend, len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#:rlecode_hqx", &in_data, &len) )
  		return NULL;
  
***************
*** 625,629 ****
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#", &bin_data, &len) )
  		return NULL;
  
--- 625,629 ----
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#:b2a_hqx", &bin_data, &len) )
  		return NULL;
  
***************
*** 665,669 ****
  	int in_len, out_len, out_len_left;
  
! 	if ( !PyArg_ParseTuple(args, "s#", &in_data, &in_len) )
  		return NULL;
  
--- 665,669 ----
  	int in_len, out_len, out_len_left;
  
! 	if ( !PyArg_ParseTuple(args, "s#:rledecode_hqx", &in_data, &in_len) )
  		return NULL;
  
***************
*** 763,767 ****
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#i", &bin_data, &len, &crc) )
  		return NULL;
  
--- 763,767 ----
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#i:crc_hqx", &bin_data, &len, &crc) )
  		return NULL;
  
***************
*** 903,907 ****
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#|l", &bin_data, &len, &crc) )
  		return NULL;
  
--- 903,907 ----
  	int len;
  	
! 	if ( !PyArg_ParseTuple(args, "s#|l:crc32", &bin_data, &len, &crc) )
  		return NULL;
  

Index: bsddbmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/bsddbmodule.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** bsddbmodule.c	1999/09/20 13:28:18	1.16
--- bsddbmodule.c	2000/02/29 13:59:22	1.17
***************
*** 698,702 ****
  	int lorder = 0;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiii",
  			      &file, &flag, &mode,
  			      &bsize, &ffactor, &nelem, &cachesize,
--- 698,702 ----
  	int lorder = 0;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiii:hashopen",
  			      &file, &flag, &mode,
  			      &bsize, &ffactor, &nelem, &cachesize,
***************
*** 751,755 ****
  	int lorder = 0;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiii",
  			      &file, &flag, &mode,
  			      &btflags, &cachesize, &maxkeypage, &minkeypage,
--- 751,755 ----
  	int lorder = 0;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiii:btopen",
  			      &file, &flag, &mode,
  			      &btflags, &cachesize, &maxkeypage, &minkeypage,
***************
*** 806,810 ****
  	char *bfname = NULL;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiiss",
  			      &file, &flag, &mode,
  			      &rnflags, &cachesize, &psize, &lorder,
--- 806,810 ----
  	char *bfname = NULL;
  
! 	if (!PyArg_ParseTuple(args, "s|siiiiiiss:rnopen",
  			      &file, &flag, &mode,
  			      &rnflags, &cachesize, &psize, &lorder,

Index: cPickle.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/cPickle.c,v
retrieving revision 2.37
retrieving revision 2.38
diff -C2 -r2.37 -r2.38
*** cPickle.c	1999/07/13 15:18:58	2.37
--- cPickle.c	2000/02/29 13:59:22	2.38
***************
*** 1869,1873 ****
  static PyObject *
  Pickle_clear_memo(Picklerobject *self, PyObject *args) {
!   if (args && ! PyArg_ParseTuple(args,"")) return NULL;
    if (self->memo) PyDict_Clear(self->memo);
    Py_INCREF(Py_None);
--- 1869,1873 ----
  static PyObject *
  Pickle_clear_memo(Picklerobject *self, PyObject *args) {
!   if (args && ! PyArg_ParseTuple(args,":clear_memo")) return NULL;
    if (self->memo) PyDict_Clear(self->memo);
    Py_INCREF(Py_None);
***************
*** 1883,1887 ****
    Pdata *data;
  
!   if (args && ! PyArg_ParseTuple(args,"|i",&clear)) return NULL;
  
    /* Check to make sure we are based on a list */
--- 1883,1887 ----
    Pdata *data;
  
!   if (args && ! PyArg_ParseTuple(args,"|i:getvalue",&clear)) return NULL;
  
    /* Check to make sure we are based on a list */
***************
*** 2015,2019 ****
      int get=0;
  
!     UNLESS (PyArg_ParseTuple(args, "O|i", &ob, &get))
          return NULL;
  
--- 2015,2019 ----
      int get=0;
  
!     UNLESS (PyArg_ParseTuple(args, "O|i:dump", &ob, &get))
          return NULL;
  
***************
*** 2133,2140 ****
  
      bin=1;
!     if (! PyArg_ParseTuple(args, "|i", &bin)) {
          PyErr_Clear();
          bin=0;
!         if (! PyArg_ParseTuple(args, "O|i", &file, &bin))
            return NULL;
        }
--- 2133,2140 ----
  
      bin=1;
!     if (! PyArg_ParseTuple(args, "|i:Pickler", &bin)) {
          PyErr_Clear();
          bin=0;
!         if (! PyArg_ParseTuple(args, "O|i:Pickler", &file, &bin))
            return NULL;
        }
***************
*** 3854,3858 ****
  static PyObject *
  Unpickler_load(Unpicklerobject *self, PyObject *args) {
!     UNLESS (PyArg_ParseTuple(args, "")) 
          return NULL;
  
--- 3854,3858 ----
  static PyObject *
  Unpickler_load(Unpicklerobject *self, PyObject *args) {
!     UNLESS (PyArg_ParseTuple(args, ":load")) 
          return NULL;
  
***************
*** 3862,3866 ****
  static PyObject *
  Unpickler_noload(Unpicklerobject *self, PyObject *args) {
!     UNLESS (PyArg_ParseTuple(args, "")) 
          return NULL;
  
--- 3862,3866 ----
  static PyObject *
  Unpickler_noload(Unpicklerobject *self, PyObject *args) {
!     UNLESS (PyArg_ParseTuple(args, ":noload")) 
          return NULL;
  
***************
*** 3970,3974 ****
      PyObject *file;
    
!     UNLESS (PyArg_ParseTuple(args, "O", &file))
          return NULL;
      return (PyObject *)newUnpicklerobject(file);
--- 3970,3974 ----
      PyObject *file;
    
!     UNLESS (PyArg_ParseTuple(args, "O:Unpickler", &file))
          return NULL;
      return (PyObject *)newUnpicklerobject(file);
***************
*** 4111,4115 ****
      int bin = 0;
  
!     UNLESS (PyArg_ParseTuple(args, "O|i", &ob, &bin))
          goto finally;
  
--- 4111,4115 ----
      int bin = 0;
  
!     UNLESS (PyArg_ParseTuple(args, "O|i:dumps", &ob, &bin))
          goto finally;
  
***************
*** 4138,4142 ****
      PyObject *ob, *res = NULL;
  
!     UNLESS (PyArg_ParseTuple(args, "O", &ob))
          goto finally;
  
--- 4138,4142 ----
      PyObject *ob, *res = NULL;
  
!     UNLESS (PyArg_ParseTuple(args, "O:load", &ob))
          goto finally;
  
***************
*** 4158,4162 ****
      Unpicklerobject *unpickler = 0;
  
!     UNLESS (PyArg_ParseTuple(args, "S", &ob))
          goto finally;
  
--- 4158,4162 ----
      Unpicklerobject *unpickler = 0;
  
!     UNLESS (PyArg_ParseTuple(args, "S:loads", &ob))
          goto finally;
  

Index: cStringIO.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/cStringIO.c,v
retrieving revision 2.17
retrieving revision 2.18
diff -C2 -r2.17 -r2.18
*** cStringIO.c	1999/06/15 14:35:48	2.17
--- cStringIO.c	2000/02/29 13:59:22	2.18
***************
*** 135,139 ****
    int position, mode = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "i|i", &position, &mode)) {
      return NULL;
    }
--- 135,139 ----
    int position, mode = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "i|i:seek", &position, &mode)) {
      return NULL;
    }
***************
*** 188,192 ****
    char *output;
  
!   UNLESS(PyArg_ParseTuple(args, "|i", &n)) return NULL;
  
    n=O_cread((PyObject*)self,&output,n);
--- 188,192 ----
    char *output;
  
!   UNLESS(PyArg_ParseTuple(args, "|i:read", &n)) return NULL;
  
    n=O_cread((PyObject*)self,&output,n);
***************
*** 265,269 ****
    int l;
  
!   UNLESS(PyArg_ParseTuple(args, "O", &s)) return NULL;
    UNLESS(-1 != (l=PyString_Size(s))) return NULL;
    UNLESS(c=PyString_AsString(s)) return NULL;
--- 265,269 ----
    int l;
  
!   UNLESS(PyArg_ParseTuple(args, "O:write", &s)) return NULL;
    UNLESS(-1 != (l=PyString_Size(s))) return NULL;
    UNLESS(c=PyString_AsString(s)) return NULL;
***************
*** 287,291 ****
  
    use_pos=Py_None;
!   UNLESS(PyArg_ParseTuple(args,"|O",&use_pos)) return NULL;
    if(PyObject_IsTrue(use_pos)) {
        s=self->pos;
--- 287,291 ----
  
    use_pos=Py_None;
!   UNLESS(PyArg_ParseTuple(args,"|O:getval",&use_pos)) return NULL;
    if(PyObject_IsTrue(use_pos)) {
        s=self->pos;
***************
*** 351,355 ****
    static PyObject *string_joinfields = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "O", &args)) {
      return NULL;
    }
--- 351,355 ----
    static PyObject *string_joinfields = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "O:writelines", &args)) {
      return NULL;
    }
***************
*** 501,505 ****
    int position, mode = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "i|i", &position, &mode)) {
      return NULL;
    }
--- 501,505 ----
    int position, mode = 0;
  
!   UNLESS(PyArg_ParseTuple(args, "i|i:seek", &position, &mode)) {
      return NULL;
    }
***************
*** 604,608 ****
    PyObject *s=0;
  
!   UNLESS(PyArg_ParseTuple(args, "|O", &s)) return NULL;
    if(s) return newIobject(s);
    return newOobject(128);
--- 604,608 ----
    PyObject *s=0;
  
!   UNLESS(PyArg_ParseTuple(args, "|O:StringIO", &s)) return NULL;
    if(s) return newIobject(s);
    return newOobject(128);

Index: cdmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/cdmodule.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** cdmodule.c	1997/10/01 04:43:39	1.17
--- cdmodule.c	2000/02/29 13:59:23	1.18
***************
*** 51,55 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 51,55 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":allowremoval"))
  		return NULL;
  
***************
*** 65,69 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 65,69 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":preventremoval"))
  		return NULL;
  
***************
*** 79,83 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 79,83 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":bestreadsize"))
  		return NULL;
  
***************
*** 90,94 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 90,94 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":close"))
  		return NULL;
  
***************
*** 110,114 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 110,114 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ":eject"))
  		return NULL;
  
***************
*** 133,137 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 133,137 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ":getstatus"))
  		return NULL;
  
***************
*** 158,162 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "i", &track))
  		return NULL;
  
--- 158,162 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "i:gettrackinfo", &track))
  		return NULL;
  
***************
*** 182,186 ****
  	int min, sec, frame;
  
! 	if (!PyArg_ParseTuple(args, "iii", &min, &sec, &frame))
  		return NULL;
  
--- 182,186 ----
  	int min, sec, frame;
  
! 	if (!PyArg_ParseTuple(args, "iii:msftoblock", &min, &sec, &frame))
  		return NULL;
  
***************
*** 197,201 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "ii", &start, &play))
  		return NULL;
  
--- 197,201 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "ii:play", &start, &play))
  		return NULL;
  
***************
*** 221,225 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "iiii", &min, &sec, &frame, &play))
  		return NULL;
  
--- 221,225 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "iiii:playabs", &min, &sec, &frame, &play))
  		return NULL;
  
***************
*** 245,249 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "ii", &start, &play))
  		return NULL;
  
--- 245,249 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "ii:playtrack", &start, &play))
  		return NULL;
  
***************
*** 269,273 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "iiiii", &track, &min, &sec,
  			      &frame, &play))
  		return NULL;
--- 269,273 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, "iiiii:playtrackabs", &track, &min, &sec,
  			      &frame, &play))
  		return NULL;
***************
*** 294,298 ****
  	PyObject *result;
  
! 	if (!PyArg_ParseTuple(args, "i", &numframes))
  		return NULL;
  
--- 294,298 ----
  	PyObject *result;
  
! 	if (!PyArg_ParseTuple(args, "i:readda", &numframes))
  		return NULL;
  
***************
*** 323,327 ****
  	long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "iii", &min, &sec, &frame))
  		return NULL;
  
--- 323,327 ----
  	long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "iii:seek", &min, &sec, &frame))
  		return NULL;
  
***************
*** 343,347 ****
  	long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "i", &track))
  		return NULL;
  
--- 343,347 ----
  	long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "i:seektrack", &track))
  		return NULL;
  
***************
*** 362,366 ****
  	unsigned long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "l", &PyTryBlock))
  		return NULL;
  
--- 362,366 ----
  	unsigned long PyTryBlock;
  
! 	if (!PyArg_ParseTuple(args, "l:seekblock", &PyTryBlock))
  		return NULL;
  
***************
*** 381,385 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 381,385 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ":stop"))
  		return NULL;
  
***************
*** 404,408 ****
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 404,408 ----
  	CDSTATUS status;
  
! 	if (!PyArg_ParseTuple(args, ":togglepause"))
  		return NULL;
  
***************
*** 504,508 ****
  	dev = NULL;
  	direction = "r";
! 	if (!PyArg_ParseTuple(args, "|zs", &dev, &direction))
  		return NULL;
  
--- 504,508 ----
  	dev = NULL;
  	direction = "r";
! 	if (!PyArg_ParseTuple(args, "|zs:open", &dev, &direction))
  		return NULL;
  
***************
*** 606,610 ****
  	int i;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 606,610 ----
  	int i;
  
! 	if (!PyArg_ParseTuple(args, ":deleteparser"))
  		return NULL;
  
***************
*** 633,637 ****
  	CDFRAME *p;
  
! 	if (!PyArg_ParseTuple(args, "s#", &cdfp, &length))
  		return NULL;
  
--- 633,637 ----
  	CDFRAME *p;
  
! 	if (!PyArg_ParseTuple(args, "s#:parseframe", &cdfp, &length))
  		return NULL;
  
***************
*** 661,665 ****
  	int type;
  
! 	if (!PyArg_ParseTuple(args, "i", &type))
  		return NULL;
  
--- 661,665 ----
  	int type;
  
! 	if (!PyArg_ParseTuple(args, "i:removecallback", &type))
  		return NULL;
  
***************
*** 686,690 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  
--- 686,690 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":resetparser"))
  		return NULL;
  
***************
*** 704,708 ****
  
  	/* XXX - more work here */
! 	if (!PyArg_ParseTuple(args, "iOO", &type, &func, &funcarg))
  		return NULL;
  
--- 704,708 ----
  
  	/* XXX - more work here */
! 	if (!PyArg_ParseTuple(args, "iOO:addcallback", &type, &func, &funcarg))
  		return NULL;
  
***************
*** 817,821 ****
  	CDPARSER *cdp;
  
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	cdp = CDcreateparser();
--- 817,821 ----
  	CDPARSER *cdp;
  
! 	if (!PyArg_ParseTuple(args, ":createparser"))
  		return NULL;
  	cdp = CDcreateparser();
***************
*** 834,838 ****
  	int min, sec, frame;
  
! 	if (!PyArg_ParseTuple(args, "iii", &min, &sec, &frame))
  		return NULL;
  
--- 834,838 ----
  	int min, sec, frame;
  
! 	if (!PyArg_ParseTuple(args, "iii:msftoframe", &min, &sec, &frame))
  		return NULL;
  

Index: dbmmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/dbmmodule.c,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** dbmmodule.c	1998/12/04 18:49:44	2.15
--- dbmmodule.c	2000/02/29 13:59:23	2.16
***************
*** 287,291 ****
  	int mode = 0666;
  
!         if ( !PyArg_ParseTuple(args, "s|si", &name, &flags, &mode) )
  		return NULL;
  	if ( strcmp(flags, "r") == 0 )
--- 287,291 ----
  	int mode = 0666;
  
!         if ( !PyArg_ParseTuple(args, "s|si:open", &name, &flags, &mode) )
  		return NULL;
  	if ( strcmp(flags, "r") == 0 )

Index: fcntlmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/fcntlmodule.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** fcntlmodule.c	1999/01/06 18:44:23	2.18
--- fcntlmodule.c	2000/02/29 13:59:23	2.19
***************
*** 235,239 ****
  	PyObject *lenobj = NULL, *startobj = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ii|OOi", &fd, &code,
  			      &lenobj, &startobj, &whence))
  	    return NULL;
--- 235,239 ----
  	PyObject *lenobj = NULL, *startobj = NULL;
  
! 	if (!PyArg_ParseTuple(args, "ii|OOi:lockf", &fd, &code,
  			      &lenobj, &startobj, &whence))
  	    return NULL;

Index: gdbmmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/gdbmmodule.c,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -r2.20 -r2.21
*** gdbmmodule.c	2000/02/07 17:19:41	2.20
--- gdbmmodule.c	2000/02/29 13:59:23	2.21
***************
*** 491,495 ****
  	int mode = 0666;
  
! 	if ( !PyArg_ParseTuple(args, "s|si", &name, &flags, &mode) )
  		return NULL;
  	switch (flags[0]) {
--- 491,495 ----
  	int mode = 0666;
  
! 	if ( !PyArg_ParseTuple(args, "s|si:open", &name, &flags, &mode) )
  		return NULL;
  	switch (flags[0]) {

Index: md5module.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/md5module.c,v
retrieving revision 2.13
retrieving revision 2.14
diff -C2 -r2.13 -r2.14
*** md5module.c	2000/02/04 20:32:35	2.13
--- md5module.c	2000/02/29 13:59:23	2.14
***************
*** 238,242 ****
  	int len = 0;
  
! 	if (!PyArg_ParseTuple(args, "|s#", &cp, &len))
  		return NULL;
  
--- 238,242 ----
  	int len = 0;
  
! 	if (!PyArg_ParseTuple(args, "|s#:new", &cp, &len))
  		return NULL;
  

Index: newmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/newmodule.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -r2.18 -r2.19
*** newmodule.c	1998/12/04 18:49:55	2.18
--- newmodule.c	2000/02/29 13:59:23	2.19
***************
*** 46,50 ****
  	PyObject *dict;
  	PyInstanceObject *inst;
! 	if (!PyArg_ParseTuple(args, "O!O!",
  			      &PyClass_Type, &klass,
  			      &PyDict_Type, &dict))
--- 46,50 ----
  	PyObject *dict;
  	PyInstanceObject *inst;
! 	if (!PyArg_ParseTuple(args, "O!O!:instance",
  			      &PyClass_Type, &klass,
  			      &PyDict_Type, &dict))
***************
*** 72,76 ****
  	PyObject* classObj;
  
! 	if (!PyArg_ParseTuple(args, "OOO!",
  			      &func,
  			      &self,
--- 72,76 ----
  	PyObject* classObj;
  
! 	if (!PyArg_ParseTuple(args, "OOO!:instancemethod",
  			      &func,
  			      &self,
***************
*** 106,110 ****
  	PyFunctionObject* newfunc;
  
! 	if (!PyArg_ParseTuple(args, "O!O!|SO!",
  			      &PyCode_Type, &code,
  			      &PyDict_Type, &globals,
--- 106,110 ----
  	PyFunctionObject* newfunc;
  
! 	if (!PyArg_ParseTuple(args, "O!O!|SO!:function",
  			      &PyCode_Type, &code,
  			      &PyDict_Type, &globals,
***************
*** 153,157 ****
  	PyBufferProcs *pb;
  
! 	if (!PyArg_ParseTuple(args, "iiiiOO!O!O!SSiS",
  			      &argcount, &nlocals, &stacksize, &flags,
  			      &code,
--- 153,157 ----
  	PyBufferProcs *pb;
  
! 	if (!PyArg_ParseTuple(args, "iiiiOO!O!O!SSiS:code",
  			      &argcount, &nlocals, &stacksize, &flags,
  			      &code,
***************
*** 189,193 ****
  	char *name;
    
! 	if (!PyArg_ParseTuple(args, "s", &name))
  		return NULL;
  	return PyModule_New(name);
--- 189,193 ----
  	char *name;
    
! 	if (!PyArg_ParseTuple(args, "s:module", &name))
  		return NULL;
  	return PyModule_New(name);
***************
*** 206,210 ****
  	PyObject * dict;
    
! 	if (!PyArg_ParseTuple(args, "SO!O!", &name, &PyTuple_Type, &classes,
  			      &PyDict_Type, &dict))
  		return NULL;
--- 206,210 ----
  	PyObject * dict;
    
! 	if (!PyArg_ParseTuple(args, "SO!O!:class", &name, &PyTuple_Type, &classes,
  			      &PyDict_Type, &dict))
  		return NULL;

Index: pcremodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/pcremodule.c,v
retrieving revision 2.16
retrieving revision 2.17
diff -C2 -r2.16 -r2.17
*** pcremodule.c	2000/02/18 18:30:01	2.16
--- pcremodule.c	2000/02/29 13:59:23	2.17
***************
*** 110,114 ****
  	PyObject *list;
  
! 	if (!PyArg_ParseTuple(args, "t#|iiii", &string, &stringlen, &pos, &endpos, &options))
  		return NULL;
  	if (endpos == -1) {endpos = stringlen;}
--- 110,114 ----
  	PyObject *list;
  
! 	if (!PyArg_ParseTuple(args, "t#|iiii:match", &string, &stringlen, &pos, &endpos, &options))
  		return NULL;
  	if (endpos == -1) {endpos = stringlen;}
***************
*** 194,198 ****
  	
  	int options, erroroffset;
! 	if (!PyArg_ParseTuple(args, "siO!", &pattern, &options,
  			      &PyDict_Type, &dictionary))
  		return NULL;
--- 194,198 ----
  	
  	int options, erroroffset;
! 	if (!PyArg_ParseTuple(args, "siO!:pcre_compile", &pattern, &options,
  			      &PyDict_Type, &dictionary))
  		return NULL;
***************
*** 472,476 ****
  	int size, total_len, i, start, pos;
  
! 	if (!PyArg_ParseTuple(args, "OS", &match_obj, &repl_obj)) 
  		return NULL;
  
--- 472,476 ----
  	int size, total_len, i, start, pos;
  
! 	if (!PyArg_ParseTuple(args, "OS:pcre_expand", &match_obj, &repl_obj)) 
  		return NULL;
  

Index: puremodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/puremodule.c,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -r2.1 -r2.2
*** puremodule.c	1997/01/17 00:01:29	2.1
--- puremodule.c	2000/02/29 13:59:23	2.2
***************
*** 322,326 ****
  	int id;
  
! 	if (!PyArg_ParseTuple(args, "li", &memrep, &id))
  		return NULL;
  
--- 322,326 ----
  	int id;
  
! 	if (!PyArg_ParseTuple(args, "li:purify_set_pool_id", &memrep, &id))
  		return NULL;
  
***************
*** 344,348 ****
  	long datarep;
  
! 	if (!PyArg_ParseTuple(args, "ll", &memrep, &datarep))
  		return NULL;
  
--- 344,348 ----
  	long datarep;
  
! 	if (!PyArg_ParseTuple(args, "ll:purify_set_user_data", &memrep, &datarep))
  		return NULL;
  
***************
*** 362,366 ****
  	void* data;
  
! 	if (!PyArg_ParseTuple(args, "l", &memrep))
  		return NULL;
  
--- 362,366 ----
  	void* data;
  
! 	if (!PyArg_ParseTuple(args, "l:purify_get_user_data", &memrep))
  		return NULL;
  
***************
*** 412,416 ****
  	int id;
  
! 	if (!PyArg_ParseTuple(args, "iO", &id, &arg_callable))
  		return NULL;
  
--- 412,416 ----
  	int id;
  
! 	if (!PyArg_ParseTuple(args, "iO:purify_map_pool", &id, &arg_callable))
  		return NULL;
  
***************
*** 452,456 ****
  	PyObject* arg_callable;
  
! 	if (!PyArg_ParseTuple(args, "O", &arg_callable))
  		return NULL;
  
--- 452,456 ----
  	PyObject* arg_callable;
  
! 	if (!PyArg_ParseTuple(args, "O:purify_map_pool_id", &arg_callable))
  		return NULL;
  
***************
*** 531,535 ****
  	char* stringarg;
  
! 	if (!PyArg_ParseTuple(args, "s", &stringarg))
  		return NULL;
  
--- 531,535 ----
  	char* stringarg;
  
! 	if (!PyArg_ParseTuple(args, "s:purify_name_thread", &stringarg))
  		return NULL;
  
***************
*** 667,671 ****
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "lis", &addrrep, &size, &type))
  		return NULL;
  
--- 667,671 ----
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "lis:purify_watch_n", &addrrep, &size, &type))
  		return NULL;
  
***************
*** 690,694 ****
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "i", &watchno))
  		return NULL;
  
--- 690,694 ----
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "i:purify_watch_remove", &watchno))
  		return NULL;
  
***************
*** 712,716 ****
  	char* rtn;
  
! 	if (!PyArg_ParseTuple(args, "l", &addrrep))
  		return NULL;
  
--- 712,716 ----
  	char* rtn;
  
! 	if (!PyArg_ParseTuple(args, "l:purify_describe", &addrrep))
  		return NULL;
  
***************
*** 728,732 ****
  	int status;
      
! 	if (!PyArg_ParseTuple(args, "li", &addrrep, &size))
  		return NULL;
  
--- 728,732 ----
  	int status;
      
! 	if (!PyArg_ParseTuple(args, "li:purify_what_colors", &addrrep, &size))
  		return NULL;
  
***************
*** 773,777 ****
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "i", &status))
  		return NULL;
  
--- 773,777 ----
  	int status;
  
! 	if (!PyArg_ParseTuple(args, "i:purify_exit", &status))
  		return NULL;
  

Index: readline.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/readline.c,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -r2.15 -r2.16
*** readline.c	1999/11/18 17:51:02	2.15
--- readline.c	2000/02/29 13:59:23	2.16
***************
*** 51,55 ****
  {
  	char *s, *copy;
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	/* Make a copy -- rl_parse_and_bind() modifies its argument */
--- 51,55 ----
  {
  	char *s, *copy;
! 	if (!PyArg_ParseTuple(args, "s:parse_and_bind", &s))
  		return NULL;
  	/* Make a copy -- rl_parse_and_bind() modifies its argument */
***************
*** 79,83 ****
  {
  	char *s = NULL;
! 	if (!PyArg_ParseTuple(args, "|z", &s))
  		return NULL;
  	errno = rl_read_init_file(s);
--- 79,83 ----
  {
  	char *s = NULL;
! 	if (!PyArg_ParseTuple(args, "|z:read_init_file", &s))
  		return NULL;
  	errno = rl_read_init_file(s);
***************
*** 147,151 ****
  	char *break_chars;
  
! 	if(!PyArg_ParseTuple(args, "s", &break_chars)) {
  		return NULL;
  	}
--- 147,151 ----
  	char *break_chars;
  
! 	if(!PyArg_ParseTuple(args, "s:set_completer_delims", &break_chars)) {
  		return NULL;
  	}
***************
*** 184,188 ****
  {
  	PyObject *function = Py_None;
! 	if (!PyArg_ParseTuple(args, "|O", &function))
  		return NULL;
  	if (function == Py_None) {
--- 184,188 ----
  {
  	PyObject *function = Py_None;
! 	if (!PyArg_ParseTuple(args, "|O:set_completer", &function))
  		return NULL;
  	if (function == Py_None) {
***************
*** 240,244 ****
  {
  	char *s;
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	rl_insert_text(s);
--- 240,244 ----
  {
  	char *s;
! 	if (!PyArg_ParseTuple(args, "s:insert_text", &s))
  		return NULL;
  	rl_insert_text(s);

Index: regexmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/regexmodule.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** regexmodule.c	1998/12/04 18:50:02	1.32
--- regexmodule.c	2000/02/29 13:59:23	1.33
***************
*** 120,124 ****
  	int result;
  
! 	if (!PyArg_ParseTuple(args, "O|i", &argstring, &offset))
  		return NULL;
  	if (!PyArg_Parse(argstring, "t#", &buffer, &size))
--- 120,124 ----
  	int result;
  
! 	if (!PyArg_ParseTuple(args, "O|i:match", &argstring, &offset))
  		return NULL;
  	if (!PyArg_Parse(argstring, "t#", &buffer, &size))
***************
*** 159,165 ****
  	int result;
  	
! 	if (!PyArg_ParseTuple(args, "O|i", &argstring, &offset))
  		return NULL;
! 	if (!PyArg_Parse(argstring, "t#", &buffer, &size))
  		return NULL;
  
--- 159,165 ----
  	int result;
  	
! 	if (!PyArg_ParseTuple(args, "O|i:search", &argstring, &offset))
  		return NULL;
! 	if (!PyArg_Parse(argstring, "t#:search", &buffer, &size))
  		return NULL;
  
***************
*** 460,464 ****
  	PyObject *tran = NULL;
  
! 	if (!PyArg_ParseTuple(args, "S|S", &pat, &tran))
  		return NULL;
  	return newregexobject(pat, tran, pat, NULL);
--- 460,464 ----
  	PyObject *tran = NULL;
  
! 	if (!PyArg_ParseTuple(args, "S|S:compile", &pat, &tran))
  		return NULL;
  	return newregexobject(pat, tran, pat, NULL);
***************
*** 585,589 ****
  	PyObject *retval = NULL;
  
! 	if (!PyArg_ParseTuple(args, "S|S", &pattern, &tran))
  		return NULL;
  
--- 585,589 ----
  	PyObject *retval = NULL;
  
! 	if (!PyArg_ParseTuple(args, "S|S:symcomp", &pattern, &tran))
  		return NULL;
  

Index: resource.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/resource.c,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -r2.9 -r2.10
*** resource.c	1999/01/06 18:44:57	2.9
--- resource.c	2000/02/29 13:59:23	2.10
***************
*** 61,65 ****
  	struct rusage ru;
  
! 	if (!PyArg_ParseTuple(args, "i", &who))
  		return NULL;
  
--- 61,65 ----
  	struct rusage ru;
  
! 	if (!PyArg_ParseTuple(args, "i:getrusage", &who))
  		return NULL;
  
***************
*** 108,112 ****
  	int resource;
  
! 	if (!PyArg_ParseTuple(args, "i", &resource)) 
  		return NULL;
  
--- 108,112 ----
  	int resource;
  
! 	if (!PyArg_ParseTuple(args, "i:getrlimit", &resource)) 
  		return NULL;
  
***************
*** 141,145 ****
  	PyObject *curobj, *maxobj;
  
! 	if (!PyArg_ParseTuple(args, "i(OO)", &resource, &curobj, &maxobj))
  		return NULL;
  
--- 141,145 ----
  	PyObject *curobj, *maxobj;
  
! 	if (!PyArg_ParseTuple(args, "i(OO):setrlimit", &resource, &curobj, &maxobj))
  		return NULL;
  
***************
*** 183,187 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	return Py_BuildValue("i", getpagesize());
--- 183,187 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":getpagesize"))
  		return NULL;
  	return Py_BuildValue("i", getpagesize());

Index: rotormodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/rotormodule.c,v
retrieving revision 2.21
retrieving revision 2.22
diff -C2 -r2.21 -r2.22
*** rotormodule.c	1998/12/04 18:50:04	2.21
--- rotormodule.c	2000/02/29 13:59:23	2.22
***************
*** 584,588 ****
  	char *key;
  
! 	if (!PyArg_ParseTuple(args, "s", &key))
  		return NULL;
  
--- 584,588 ----
  	char *key;
  
! 	if (!PyArg_ParseTuple(args, "s:setkey", &key))
  		return NULL;
  
***************
*** 640,644 ****
  	int num_rotors = 6;
  
! 	if (!PyArg_ParseTuple(args, "s#|i", &string, &len, &num_rotors))
  		return NULL;
  
--- 640,644 ----
  	int num_rotors = 6;
  
! 	if (!PyArg_ParseTuple(args, "s#|i:newrotor", &string, &len, &num_rotors))
  		return NULL;
  

Index: selectmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/selectmodule.c,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -r2.30 -r2.31
*** selectmodule.c	2000/01/14 16:33:09	2.30
--- selectmodule.c	2000/02/29 13:59:23	2.31
***************
*** 244,248 ****
  
  	/* convert arguments */
! 	if (!PyArg_ParseTuple(args, "OOO|O",
  			      &ifdlist, &ofdlist, &efdlist, &tout))
  		return NULL;
--- 244,248 ----
  
  	/* convert arguments */
! 	if (!PyArg_ParseTuple(args, "OOO|O:select",
  			      &ifdlist, &ofdlist, &efdlist, &tout))
  		return NULL;

Index: shamodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/shamodule.c,v
retrieving revision 2.3
retrieving revision 2.4
diff -C2 -r2.3 -r2.4
*** shamodule.c	1999/04/10 15:46:58	2.3
--- shamodule.c	2000/02/29 13:59:23	2.4
***************
*** 549,553 ****
  		return NULL;
  
! 	if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|s#", kwlist,
  					 &cp, &len)) {
  	        Py_DECREF(new);
--- 549,553 ----
  		return NULL;
  
! 	if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|s#:new", kwlist,
  					 &cp, &len)) {
  	        Py_DECREF(new);

Index: socketmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/socketmodule.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** socketmodule.c	1999/12/07 21:30:30	1.95
--- socketmodule.c	2000/02/29 13:59:23	1.96
***************
*** 1097,1101 ****
  	PyObject *f;
  
! 	if (!PyArg_ParseTuple(args, "|si", &mode, &bufsize))
  		return NULL;
  #ifdef MS_WIN32
--- 1097,1101 ----
  	PyObject *f;
  
! 	if (!PyArg_ParseTuple(args, "|si:makefile", &mode, &bufsize))
  		return NULL;
  #ifdef MS_WIN32
***************
*** 1132,1136 ****
  	int len, n, flags = 0;
  	PyObject *buf;
! 	if (!PyArg_ParseTuple(args, "i|i", &len, &flags))
  		return NULL;
  	buf = PyString_FromStringAndSize((char *) 0, len);
--- 1132,1136 ----
  	int len, n, flags = 0;
  	PyObject *buf;
! 	if (!PyArg_ParseTuple(args, "i|i:recv", &len, &flags))
  		return NULL;
  	buf = PyString_FromStringAndSize((char *) 0, len);
***************
*** 1169,1173 ****
  
  	int addrlen, len, n, flags = 0;
! 	if (!PyArg_ParseTuple(args, "i|i", &len, &flags))
  		return NULL;
  	if (!getsockaddrlen(s, &addrlen))
--- 1169,1173 ----
  
  	int addrlen, len, n, flags = 0;
! 	if (!PyArg_ParseTuple(args, "i|i:recvfrom", &len, &flags))
  		return NULL;
  	if (!getsockaddrlen(s, &addrlen))
***************
*** 1219,1223 ****
  	char *buf;
  	int len, n, flags = 0;
! 	if (!PyArg_ParseTuple(args, "s#|i", &buf, &len, &flags))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
--- 1219,1223 ----
  	char *buf;
  	int len, n, flags = 0;
! 	if (!PyArg_ParseTuple(args, "s#|i:send", &buf, &len, &flags))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
***************
*** 1703,1707 ****
  #endif
  	int family, type, proto = 0;
! 	if (!PyArg_ParseTuple(args, "ii|i", &family, &type, &proto))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
--- 1703,1707 ----
  #endif
  	int family, type, proto = 0;
! 	if (!PyArg_ParseTuple(args, "ii|i:socket", &family, &type, &proto))
  		return NULL;
  	Py_BEGIN_ALLOW_THREADS
***************
*** 1748,1752 ****
  	PySocketSockObject *s;
  	int fd, family, type, proto = 0;
! 	if (!PyArg_ParseTuple(args, "iii|i", &fd, &family, &type, &proto))
  		return NULL;
  	/* Dup the fd so it and the socket can be closed independently */
--- 1748,1752 ----
  	PySocketSockObject *s;
  	int fd, family, type, proto = 0;
! 	if (!PyArg_ParseTuple(args, "iii|i:fromfd", &fd, &family, &type, &proto))
  		return NULL;
  	/* Dup the fd so it and the socket can be closed independently */
***************
*** 2016,2020 ****
  	char *cert_file;
    
! 	if (!PyArg_ParseTuple(args, "O!zz",
  			      &PySocketSock_Type, (PyObject*)&Sock,
  			      &key_file, &cert_file) )
--- 2016,2020 ----
  	char *cert_file;
    
! 	if (!PyArg_ParseTuple(args, "O!zz:ssl",
  			      &PySocketSock_Type, (PyObject*)&Sock,
  			      &key_file, &cert_file) )
***************
*** 2095,2099 ****
  	int len = 0;
    
! 	if (!PyArg_ParseTuple(args, "s|i", &data, &len))
  		return NULL;
    
--- 2095,2099 ----
  	int len = 0;
    
! 	if (!PyArg_ParseTuple(args, "s|i:write", &data, &len))
  		return NULL;
    
***************
*** 2112,2116 ****
  	int res;
    
! 	PyArg_ParseTuple(args, "|i", &len);
    
  	if (!(buf = PyString_FromStringAndSize((char *) 0, len)))
--- 2112,2116 ----
  	int res;
    
! 	PyArg_ParseTuple(args, "|i:read", &len);
    
  	if (!(buf = PyString_FromStringAndSize((char *) 0, len)))

Index: soundex.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/soundex.c,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -r2.6 -r2.7
*** soundex.c	1998/12/04 18:50:08	2.6
--- soundex.c	2000/02/29 13:59:24	2.7
***************
*** 126,130 ****
  	char sdx[7];
  
! 	if(!PyArg_ParseTuple( args, "s", &str))
  	  return NULL;
  
--- 126,130 ----
  	char sdx[7];
  
! 	if(!PyArg_ParseTuple( args, "s:get_soundex", &str))
  	  return NULL;
  
***************
*** 142,146 ****
      char res1[7], res2[7];
      
!     if(!PyArg_ParseTuple(args, "ss", &str1, &str2))
          return NULL;
  
--- 142,146 ----
      char res1[7], res2[7];
      
!     if(!PyArg_ParseTuple(args, "ss:sound_similar", &str1, &str2))
          return NULL;
  

Index: stropmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/stropmodule.c,v
retrieving revision 2.60
retrieving revision 2.61
diff -C2 -r2.60 -r2.61
*** stropmodule.c	1999/11/04 19:19:48	2.60
--- stropmodule.c	2000/02/29 13:59:24	2.61
***************
*** 142,146 ****
  	splitcount = 0;
  	maxsplit = 0;
! 	if (!PyArg_ParseTuple(args, "t#|z#i", &s, &len, &sub, &n, &maxsplit))
  		return NULL;
  	if (sub == NULL)
--- 142,146 ----
  	splitcount = 0;
  	maxsplit = 0;
! 	if (!PyArg_ParseTuple(args, "t#|z#i:split", &s, &len, &sub, &n, &maxsplit))
  		return NULL;
  	if (sub == NULL)
***************
*** 212,216 ****
  	intargfunc getitemfunc;
  
! 	if (!PyArg_ParseTuple(args, "O|t#", &seq, &sep, &seplen))
  		return NULL;
  	if (sep == NULL) {
--- 212,216 ----
  	intargfunc getitemfunc;
  
! 	if (!PyArg_ParseTuple(args, "O|t#:join", &seq, &sep, &seplen))
  		return NULL;
  	if (sep == NULL) {
***************
*** 339,343 ****
  	int len, n, i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  
--- 339,343 ----
  	int len, n, i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii:find", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  
***************
*** 384,388 ****
  	int i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  
--- 384,388 ----
  	int i = 0, last = INT_MAX;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii:rfind", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  
***************
*** 643,647 ****
  
  	/* Get arguments */
! 	if (!PyArg_ParseTuple(args, "s#|i", &string, &stringlen, &tabsize))
  		return NULL;
  	if (tabsize < 1) {
--- 643,647 ----
  
  	/* Get arguments */
! 	if (!PyArg_ParseTuple(args, "s#|i:expandtabs", &string, &stringlen, &tabsize))
  		return NULL;
  	if (tabsize < 1) {
***************
*** 709,713 ****
  	int m, r;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  	if (last > len)
--- 709,713 ----
  	int m, r;
  
! 	if (!PyArg_ParseTuple(args, "t#t#|ii:count", &s, &len, &sub, &n, &i, &last))
  		return NULL;
  	if (last > len)
***************
*** 804,808 ****
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s|i", &s, &base))
  		return NULL;
  
--- 804,808 ----
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s|i:atoi", &s, &base))
  		return NULL;
  
***************
*** 859,863 ****
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s|i", &s, &base))
  		return NULL;
  
--- 859,863 ----
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s|i:atol", &s, &base))
  		return NULL;
  
***************
*** 905,909 ****
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s", &s))
  		return NULL;
  	while (*s && isspace(Py_CHARMASK(*s)))
--- 905,909 ----
  	char buffer[256]; /* For errors */
  
! 	if (!PyArg_ParseTuple(args, "s:atof", &s))
  		return NULL;
  	while (*s && isspace(Py_CHARMASK(*s)))
***************
*** 949,953 ****
  	PyObject *result;
  
! 	if (!PyArg_ParseTuple(args, "t#t#", &from, &fromlen, &to, &tolen))
  		return NULL;
  
--- 949,953 ----
  	PyObject *result;
  
! 	if (!PyArg_ParseTuple(args, "t#t#:maketrans", &from, &fromlen, &to, &tolen))
  		return NULL;
  
***************
*** 992,996 ****
  	int trans_table[256];
  
! 	if (!PyArg_ParseTuple(args, "St#|t#", &input_obj,
  			      &table1, &tablen, &del_table, &dellen))
  		return NULL;
--- 992,996 ----
  	int trans_table[256];
  
! 	if (!PyArg_ParseTuple(args, "St#|t#:translate", &input_obj,
  			      &table1, &tablen, &del_table, &dellen))
  		return NULL;
***************
*** 1206,1210 ****
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, "t#t#t#|i",
  			      &str, &len, &pat, &pat_len, &sub, &sub_len,
  			      &count))
--- 1206,1210 ----
  	PyObject *new;
  
! 	if (!PyArg_ParseTuple(args, "t#t#t#|i:replace",
  			      &str, &len, &pat, &pat_len, &sub, &sub_len,
  			      &count))

Index: structmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/structmodule.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** structmodule.c	1998/12/04 18:50:11	2.29
--- structmodule.c	2000/02/29 13:59:24	2.30
***************
*** 1098,1102 ****
  	int size;
  
! 	if (!PyArg_ParseTuple(args, "s", &fmt))
  		return NULL;
  	f = whichtable(&fmt);
--- 1098,1102 ----
  	int size;
  
! 	if (!PyArg_ParseTuple(args, "s:calcsize", &fmt))
  		return NULL;
  	f = whichtable(&fmt);
***************
*** 1263,1267 ****
  	PyObject *res, *v;
  
! 	if (!PyArg_ParseTuple(args, "ss#", &fmt, &start, &len))
  		return NULL;
  	f = whichtable(&fmt);
--- 1263,1267 ----
  	PyObject *res, *v;
  
! 	if (!PyArg_ParseTuple(args, "ss#:unpack", &fmt, &start, &len))
  		return NULL;
  	f = whichtable(&fmt);

Index: syslogmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/syslogmodule.c,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -r2.12 -r2.13
*** syslogmodule.c	1998/12/04 18:50:12	2.12
--- syslogmodule.c	2000/02/29 13:59:24	2.13
***************
*** 106,110 ****
  	PyObject * args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	closelog();
--- 106,110 ----
  	PyObject * args;
  {
! 	if (!PyArg_ParseTuple(args, ":closelog"))
  		return NULL;
  	closelog();
***************
*** 135,139 ****
  	long mask;
  	long pri;
! 	if (!PyArg_ParseTuple(args, "l", &pri))
  		return NULL;
  	mask = LOG_MASK(pri);
--- 135,139 ----
  	long mask;
  	long pri;
! 	if (!PyArg_ParseTuple(args, "l:LOG_MASK", &pri))
  		return NULL;
  	mask = LOG_MASK(pri);
***************
*** 148,152 ****
  	long mask;
  	long pri;
! 	if (!PyArg_ParseTuple(args, "l", &pri))
  		return NULL;
  	mask = LOG_UPTO(pri);
--- 148,152 ----
  	long mask;
  	long pri;
! 	if (!PyArg_ParseTuple(args, "l:LOG_UPTO", &pri))
  		return NULL;
  	mask = LOG_UPTO(pri);

Index: threadmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/threadmodule.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** threadmodule.c	1998/12/21 19:32:43	2.29
--- threadmodule.c	2000/02/29 13:59:24	2.30
***************
*** 252,256 ****
  	struct bootstate *boot;
  
! 	if (!PyArg_ParseTuple(fargs, "OO|O", &func, &args, &keyw))
  		return NULL;
  	if (!PyCallable_Check(func)) {
--- 252,256 ----
  	struct bootstate *boot;
  
! 	if (!PyArg_ParseTuple(fargs, "OO|O:start_new_thread", &func, &args, &keyw))
  		return NULL;
  	if (!PyCallable_Check(func)) {

Index: timemodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.78
retrieving revision 2.79
diff -C2 -r2.78 -r2.79
*** timemodule.c	2000/01/12 16:38:20	2.78
--- timemodule.c	2000/02/29 13:59:24	2.79
***************
*** 374,378 ****
  	memset((ANY *) &buf, '\0', sizeof(buf));
  
! 	if (!PyArg_ParseTuple(args, "sO", &fmt, &tup) || !gettmarg(tup, &buf))
  		return NULL;
  	fmtlen = strlen(fmt);
--- 374,378 ----
  	memset((ANY *) &buf, '\0', sizeof(buf));
  
! 	if (!PyArg_ParseTuple(args, "sO:strftime", &fmt, &tup) || !gettmarg(tup, &buf))
  		return NULL;
  	fmtlen = strlen(fmt);
***************
*** 422,426 ****
  	char *s;
  
! 	if (!PyArg_ParseTuple(args, "s|s", &buf, &fmt)) {
  		PyErr_SetString(PyExc_ValueError, "invalid argument");
  		return NULL;
--- 422,426 ----
  	char *s;
  
! 	if (!PyArg_ParseTuple(args, "s|s:strptime", &buf, &fmt)) {
  		PyErr_SetString(PyExc_ValueError, "invalid argument");
  		return NULL;
***************
*** 456,460 ****
  	struct tm buf;
  	char *p;
! 	if (!PyArg_ParseTuple(args, "O", &tup))
  		return NULL;
  	if (!gettmarg(tup, &buf))
--- 456,460 ----
  	struct tm buf;
  	char *p;
! 	if (!PyArg_ParseTuple(args, "O:asctime", &tup))
  		return NULL;
  	if (!gettmarg(tup, &buf))
***************
*** 507,511 ****
  	struct tm buf;
  	time_t tt;
! 	if (!PyArg_ParseTuple(args, "O", &tup))
  		return NULL;
  	tt = time(&tt);
--- 507,511 ----
  	struct tm buf;
  	time_t tt;
! 	if (!PyArg_ParseTuple(args, "O:mktime", &tup))
  		return NULL;
  	tt = time(&tt);

Index: xxmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/xxmodule.c,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** xxmodule.c	1999/02/16 22:15:42	2.14
--- xxmodule.c	2000/02/29 13:59:24	2.15
***************
*** 85,89 ****
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	Py_INCREF(Py_None);
--- 85,89 ----
  	PyObject *args;
  {
! 	if (!PyArg_ParseTuple(args, ":demo"))
  		return NULL;
  	Py_INCREF(Py_None);
***************
*** 164,168 ****
  	long i, j;
  	long res;
! 	if (!PyArg_ParseTuple(args, "ll", &i, &j))
  		return NULL;
  	res = i+j; /* XXX Do something here */
--- 164,168 ----
  	long i, j;
  	long res;
! 	if (!PyArg_ParseTuple(args, "ll:foo", &i, &j))
  		return NULL;
  	res = i+j; /* XXX Do something here */
***************
*** 180,184 ****
  	XxoObject *rv;
  	
! 	if (!PyArg_ParseTuple(args, ""))
  		return NULL;
  	rv = newXxoObject(args);
--- 180,184 ----
  	XxoObject *rv;
  	
! 	if (!PyArg_ParseTuple(args, ":new"))
  		return NULL;
  	rv = newXxoObject(args);
***************
*** 197,201 ****
  	PyObject *list, *item;
  	
! 	if (!PyArg_ParseTuple(args, "O", &list))
  		return NULL;
  	
--- 197,201 ----
  	PyObject *list, *item;
  	
! 	if (!PyArg_ParseTuple(args, "O:bug", &list))
  		return NULL;
  	
***************
*** 220,224 ****
  	PyObject *a;
  	long b;
! 	if (!PyArg_ParseTuple(args, "O#", &a, &b))
  		return NULL;
  	Py_INCREF(Py_None);
--- 220,224 ----
  	PyObject *a;
  	long b;
! 	if (!PyArg_ParseTuple(args, "O#:roj", &a, &b))
  		return NULL;
  	Py_INCREF(Py_None);

Index: zlibmodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/zlibmodule.c,v
retrieving revision 2.29
retrieving revision 2.30
diff -C2 -r2.29 -r2.30
*** zlibmodule.c	1999/12/22 16:13:54	2.29
--- zlibmodule.c	2000/02/29 13:59:24	2.30
***************
*** 75,79 ****
    z_stream zst;
    
!   if (!PyArg_ParseTuple(args, "s#|i", &input, &length, &level))
      return NULL;
    zst.avail_out = length + length/1000 + 12 + 1;
--- 75,79 ----
    z_stream zst;
    
!   if (!PyArg_ParseTuple(args, "s#|i:compress", &input, &length, &level))
      return NULL;
    zst.avail_out = length + length/1000 + 12 + 1;
***************
*** 173,177 ****
    int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC;
    z_stream zst;
!   if (!PyArg_ParseTuple(args, "s#|ii", &input, &length, &wsize, &r_strlen))
      return NULL;
  
--- 173,177 ----
    int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC;
    z_stream zst;
!   if (!PyArg_ParseTuple(args, "s#|ii:decompress", &input, &length, &wsize, &r_strlen))
      return NULL;
  
***************
*** 279,283 ****
    int wbits=MAX_WBITS, memLevel=DEF_MEM_LEVEL, strategy=0, err;
  
!   if (!PyArg_ParseTuple(args, "|iiiii", &level, &method, &wbits,
  			&memLevel, &strategy))
        return NULL;
--- 279,283 ----
    int wbits=MAX_WBITS, memLevel=DEF_MEM_LEVEL, strategy=0, err;
  
!   if (!PyArg_ParseTuple(args, "|iiiii:compressobj", &level, &method, &wbits,
  			&memLevel, &strategy))
        return NULL;
***************
*** 326,330 ****
    int wbits=DEF_WBITS, err;
    compobject *self;
!   if (!PyArg_ParseTuple(args, "|i", &wbits))
      {
       return NULL;
--- 326,330 ----
    int wbits=DEF_WBITS, err;
    compobject *self;
!   if (!PyArg_ParseTuple(args, "|i:decompressobj", &wbits))
      {
       return NULL;
***************
*** 404,408 ****
    unsigned long start_total_out;
    
!   if (!PyArg_ParseTuple(args, "s#", &input, &inplen))
        return NULL;
    self->zst.avail_in = inplen;
--- 404,408 ----
    unsigned long start_total_out;
    
!   if (!PyArg_ParseTuple(args, "s#:compress", &input, &inplen))
        return NULL;
    self->zst.avail_in = inplen;
***************
*** 462,466 ****
    unsigned long start_total_out;
  
!   if (!PyArg_ParseTuple(args, "s#", &input, &inplen))
      return NULL;
    start_total_out = self->zst.total_out;
--- 462,466 ----
    unsigned long start_total_out;
  
!   if (!PyArg_ParseTuple(args, "s#:decompress", &input, &inplen))
      return NULL;
    start_total_out = self->zst.total_out;
***************
*** 536,540 ****
    unsigned long start_total_out;
  
!   if (!PyArg_ParseTuple(args, "|i", &flushmode))
        return NULL;
  
--- 536,540 ----
    unsigned long start_total_out;
  
!   if (!PyArg_ParseTuple(args, "|i:flush", &flushmode))
        return NULL;
  
***************
*** 746,750 ****
      int len;
   
!     if (!PyArg_ParseTuple(args, "s#|l", &buf, &len, &adler32val))
      {
  	return NULL;
--- 746,750 ----
      int len;
   
!     if (!PyArg_ParseTuple(args, "s#|l:adler32", &buf, &len, &adler32val))
      {
  	return NULL;
***************
*** 768,772 ****
      Byte *buf;
      int len;
!     if (!PyArg_ParseTuple(args, "s#|l", &buf, &len, &crc32val))
      {
  	return NULL;
--- 768,772 ----
      Byte *buf;
      int len;
!     if (!PyArg_ParseTuple(args, "s#|l:crc32", &buf, &len, &crc32val))
      {
  	return NULL;



From fdrake@acm.org  Tue Feb 29 14:52:46 2000
From: fdrake@acm.org (Fred L. Drake, Jr.)
Date: Tue, 29 Feb 2000 09:52:46 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src Makefile.in,1.82,1.83
In-Reply-To: <200002291338.IAA04782@eric.cnri.reston.va.us>
References: <m12Ph1W-000CnCC@artcom0.artcom-gmbh.de>
 <200002291338.IAA04782@eric.cnri.reston.va.us>
Message-ID: <14523.56638.286603.340358@weyr.cnri.reston.va.us>

Guido van Rossum writes:
 > You can already extract this from the updated documetation on the
 > website (which has a list of obsolete modules).
 > 
 > But you're righ,t it would be good to be open about this.  I'll think
 > about it.

  Note that the updated documentation isn't yet "published"; there are 
no links to it and it hasn't been checked as much as I need it to be
before announcing it.
  Also, a separate announcement posted to the lists will reach more
people than the "Obsolete" section of the "Undocumented Modules"
chapter in the library reference.


  -Fred

--
Fred L. Drake, Jr.	  <fdrake at acm.org>
Corporation for National Research Initiatives


From fdrake@weyr.cnri.reston.va.us  Tue Feb 29 15:46:28 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 29 Feb 2000 10:46:28 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc README,1.36,1.36.4.1
Message-ID: <200002291546.KAA28496@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc
In directory weyr:/home/fdrake/projects/python/Doc-152p2

Modified Files:
      Tag: release152p1-patches
	README 
Log Message:

Note that really new versions of LaTeX2HTML don't work for us.  ;(


Index: README
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/README,v
retrieving revision 1.36
retrieving revision 1.36.4.1
diff -C2 -r1.36 -r1.36.4.1
*** README	1999/03/03 21:44:10	1.36
--- README	2000/02/29 15:46:25	1.36.4.1
***************
*** 131,134 ****
--- 131,136 ----
  	  up code fragments.  ;-(  Releases are available at:
  	  <http://cdc-server.cdc.informatik.tu-darmstadt.de/~latex2html/>.
+ 	  Really new versions also don't work, but I'm not sure when
+ 	  things broke.
  
  



From guido@cnri.reston.va.us  Tue Feb 29 15:52:43 2000
From: guido@cnri.reston.va.us (Guido van Rossum)
Date: Tue, 29 Feb 2000 10:52:43 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Modules Setup.in,1.89,1.90 nismodule.c,2.14,2.15
Message-ID: <200002291552.KAA06607@eric.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Modules
In directory eric:/projects/python/develop/guido/src/Modules

Modified Files:
	Setup.in nismodule.c 
Log Message:
Patch by Fred Gansevles (the module's original author).

This patch fixes 3 small problems.
1) If a map is used which is generated with 'makedbm -a',
   the trailing '\0' is now handled correctely.
2) The nis.maps() function skipped the first map in the output list.
3) The library '-lnsl' is added in Setup.in (needed on Linux glibc2 and
   Solaris systems. Maybe on other systems too?)

[I note that this still doesn't work when you are using NIS+ --GvR]


Index: Setup.in
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/Setup.in,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -r1.89 -r1.90
*** Setup.in	1999/12/07 21:47:09	1.89
--- Setup.in	2000/02/29 15:52:40	1.90
***************
*** 165,169 ****
  # are not supported by all UNIX systems:
  
! #nis nismodule.c 	# Sun yellow pages -- not everywhere
  #termios termios.c	# Steen Lumholt's termios module
  #resource resource.c	# Jeremy Hylton's rlimit interface
--- 165,169 ----
  # are not supported by all UNIX systems:
  
! #nis nismodule.c -lnsl	# Sun yellow pages -- not everywhere
  #termios termios.c	# Steen Lumholt's termios module
  #resource resource.c	# Jeremy Hylton's rlimit interface

Index: nismodule.c
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Modules/nismodule.c,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -r2.14 -r2.15
*** nismodule.c	1998/10/08 02:25:18	2.14
--- nismodule.c	2000/02/29 15:52:40	2.15
***************
*** 2,6 ****
      Written by:
  	Fred Gansevles <Fred.Gansevles@cs.utwente.nl>
! 	Vakgroep Spa,
  	Faculteit der Informatica,
  	Universiteit Twente,
--- 2,6 ----
      Written by:
  	Fred Gansevles <Fred.Gansevles@cs.utwente.nl>
! 	B&O group,
  	Faculteit der Informatica,
  	Universiteit Twente,
***************
*** 37,61 ****
  	char *alias;
  	char *map;
  } aliases [] = {
! 	{"passwd",	"passwd.byname"},
! 	{"group",	"group.byname"},
! 	{"networks",	"networks.byaddr"},
! 	{"hosts",	"hosts.byname"},
! 	{"protocols",	"protocols.bynumber"},
! 	{"services",	"services.byname"},
! 	{"aliases",	"mail.aliases"},
! 	{"ethers",	"ethers.byname"},
! 	{0L,		0L}
  };
  
  static char *
! nis_mapname (map)
  	char *map;
  {
  	int i;
  
! 	for (i=0; aliases[i].alias != 0L; i++)
! 		if (!strcmp (aliases[i].alias, map))
! 			map = aliases[i].map;
  	return map;
  }
--- 37,72 ----
  	char *alias;
  	char *map;
+ 	int  fix;
  } aliases [] = {
! 	{"passwd",	"passwd.byname",	0},
! 	{"group",	"group.byname",		0},
! 	{"networks",	"networks.byaddr",	0},
! 	{"hosts",	"hosts.byname",		0},
! 	{"protocols",	"protocols.bynumber",	0},
! 	{"services",	"services.byname",	0},
! 	{"aliases",	"mail.aliases",		1}, /* created with 'makedbm -a' */
! 	{"ethers",	"ethers.byname",	0},
! 	{0L,		0L,			0}
  };
  
  static char *
! nis_mapname (map, pfix)
  	char *map;
+ 	int *pfix;
  {
  	int i;
  
! 	*pfix = 0;
! 	for (i=0; aliases[i].alias != 0L; i++) {
! 		if (!strcmp (aliases[i].alias, map)) {
! 			*pfix = aliases[i].fix;
! 			return aliases[i].map;
! 		}
! 		if (!strcmp (aliases[i].map, map)) {
! 			*pfix = aliases[i].fix;
! 			return aliases[i].map;
! 		}
! 	}
! 
  	return map;
  }
***************
*** 63,66 ****
--- 74,82 ----
  typedef int (*foreachfunc) Py_PROTO((int, char *, int, char *, int, char *));
  
+ struct ypcallback_data {
+ 	PyObject	*dict;
+ 	int			fix;
+ };
+ 
  static int
  nis_foreach (instatus, inkey, inkeylen, inval, invallen, indata)
***************
*** 70,79 ****
  	char *inval;
  	int invallen;
! 	PyObject *indata;
  {
  	if (instatus == YP_TRUE) {
! 		PyObject *key = PyString_FromStringAndSize(inkey, inkeylen);
! 		PyObject *val = PyString_FromStringAndSize(inval, invallen);
  		int err;
  		if (key == NULL || val == NULL) {
  			/* XXX error -- don't know how to handle */
--- 86,102 ----
  	char *inval;
  	int invallen;
! 	struct ypcallback_data *indata;
  {
  	if (instatus == YP_TRUE) {
! 		PyObject *key;
! 		PyObject *val;
  		int err;
+ 
+ 		if (indata->fix) {
+ 		    inkeylen--;
+ 		    invallen--;
+ 		}
+ 		key = PyString_FromStringAndSize(inkey, inkeylen);
+ 		val = PyString_FromStringAndSize(inval, invallen);
  		if (key == NULL || val == NULL) {
  			/* XXX error -- don't know how to handle */
***************
*** 83,87 ****
  			return 1;
  		}
! 		err = PyDict_SetItem(indata, key, val);
  		Py_DECREF(key);
  		Py_DECREF(val);
--- 106,110 ----
  			return 1;
  		}
! 		err = PyDict_SetItem(indata->dict, key, val);
  		Py_DECREF(key);
  		Py_DECREF(val);
***************
*** 106,109 ****
--- 129,133 ----
  	int err;
  	PyObject *res;
+ 	int fix;
  
  	if (!PyArg_Parse(args, "(t#s)", &key, &keylen, &map))
***************
*** 111,118 ****
  	if ((err = yp_get_default_domain(&domain)) != 0)
  		return nis_error(err);
  	Py_BEGIN_ALLOW_THREADS
- 	map = nis_mapname (map);
  	err = yp_match (domain, map, key, keylen, &match, &len);
  	Py_END_ALLOW_THREADS
  	if (err != 0)
  		return nis_error(err);
--- 135,146 ----
  	if ((err = yp_get_default_domain(&domain)) != 0)
  		return nis_error(err);
+ 	map = nis_mapname (map, &fix);
+ 	if (fix)
+ 	    keylen++;
  	Py_BEGIN_ALLOW_THREADS
  	err = yp_match (domain, map, key, keylen, &match, &len);
  	Py_END_ALLOW_THREADS
+ 	if (fix)
+ 	    len--;
  	if (err != 0)
  		return nis_error(err);
***************
*** 130,134 ****
  	char *map;
  	struct ypall_callback cb;
! 	PyObject *cat;
  	int err;
  
--- 158,163 ----
  	char *map;
  	struct ypall_callback cb;
! 	struct ypcallback_data data;
! 	PyObject *dict;
  	int err;
  
***************
*** 137,154 ****
  	if ((err = yp_get_default_domain(&domain)) != 0)
  		return nis_error(err);
! 	cat = PyDict_New ();
! 	if (cat == NULL)
  		return NULL;
  	cb.foreach = (foreachfunc)nis_foreach;
! 	cb.data = (char *)cat;
  	Py_BEGIN_ALLOW_THREADS
- 	map = nis_mapname (map);
  	err = yp_all (domain, map, &cb);
  	Py_END_ALLOW_THREADS
  	if (err != 0) {
! 		Py_DECREF(cat);
  		return nis_error(err);
  	}
! 	return cat;
  }
  
--- 166,184 ----
  	if ((err = yp_get_default_domain(&domain)) != 0)
  		return nis_error(err);
! 	dict = PyDict_New ();
! 	if (dict == NULL)
  		return NULL;
  	cb.foreach = (foreachfunc)nis_foreach;
! 	data.dict = dict;
! 	map = nis_mapname (map, &data.fix);
! 	cb.data = (char *)&data;
  	Py_BEGIN_ALLOW_THREADS
  	err = yp_all (domain, map, &cb);
  	Py_END_ALLOW_THREADS
  	if (err != 0) {
! 		Py_DECREF(dict);
  		return nis_error(err);
  	}
! 	return dict;
  }
  
***************
*** 346,350 ****
  	if ((list = PyList_New(0)) == NULL)
  		return NULL;
! 	for (maps = maps->next; maps; maps = maps->next) {
  		PyObject *str = PyString_FromString(maps->map);
  		if (!str || PyList_Append(list, str) < 0)
--- 376,380 ----
  	if ((list = PyList_New(0)) == NULL)
  		return NULL;
! 	for (maps = maps; maps; maps = maps->next) {
  		PyObject *str = PyString_FromString(maps->map);
  		if (!str || PyList_Append(list, str) < 0)



From fdrake@weyr.cnri.reston.va.us  Tue Feb 29 15:53:06 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 29 Feb 2000 10:53:06 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.12,1.56.2.13
Message-ID: <200002291553.KAA28600@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p2/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Documentation for the memory management APIs, from Vladimir Marangozov
<marangoz@python.inrialpes.fr>.


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.12
retrieving revision 1.56.2.13
diff -C2 -r1.56.2.12 -r1.56.2.13
*** api.tex	2000/02/21 18:10:09	1.56.2.12
--- api.tex	2000/02/29 15:53:03	1.56.2.13
***************
*** 709,717 ****
  well as the global variable \cdata{_Py_RefTotal}.
  
- XXX Should mention Py_Malloc(), Py_Realloc(), Py_Free(),
- PyMem_Malloc(), PyMem_Realloc(), PyMem_Free(), PyMem_NEW(),
- PyMem_RESIZE(), PyMem_DEL(), PyMem_XDEL().
  
- 
  \chapter{Exception Handling \label{exceptionHandling}}
  
--- 709,713 ----
***************
*** 3248,3251 ****
--- 3244,3462 ----
  must be held.
  \end{cfuncdesc}
+ 
+ 
+ \chapter{Memory Management \label{memory}}
+ 
+ \section{Overview \label{memoryOverview}}
+ 
+ Memory management in Python involves a private heap containing all
+ Python objects and data structures. The management of this private
+ heap is ensured internally by the \emph{Python memory manager}.  The
+ Python memory manager has different components which deal with various
+ dynamic storage management aspects, like sharing, segmentation,
+ preallocation or caching.
+ 
+ At the lowest level, a raw memory allocator ensures that there is
+ enough room in the private heap for storing all Python-related data,
+ by interacting with the memory manager of the operating system. On top
+ of the raw memory allocator, several object-specific allocators
+ operate on the same heap and implement distinct memory management
+ policies adapted to the peculiarities of every object type. For
+ example, integer objects are managed differently within the heap than
+ strings, tuples or dictionaries because integers imply different
+ storage requirements and speed/space tradeoffs. The Python memory
+ manager thus delegates some of the work to the object-specific
+ allocators, but ensures that the latter operate within the bounds of
+ the private heap.
+ 
+ It is important to understand that the management of the Python heap
+ is performed by the interpreter itself and that the user has no
+ control on it, even if she manipulates regularly object pointers to
+ memory blocks inside that heap. The allocation of heap space for
+ Python objects and other internal buffers is performed on demand by
+ the Python memory manager through the Python/C API functions listed in
+ this document.
+ 
+ To avoid memory corruption, extension writers should never try to
+ operate on Python objects with the functions exported by the C
+ library: \cfunction{malloc()}, \cfunction{calloc()},
+ \cfunction{realloc()} and \cfunction{free()}. This will result in
+ mixed calls between the C allocator and the Python memory manager
+ with fatal consequences, because they implement different algorithms
+ and operate on different heaps. However, one may safely allocate and
+ release memory blocks with the C library allocator for individual
+ purposes, as shown in the following example:
+ 
+ \begin{verbatim}
+ {
+     PyObject *res;
+     char *buf = (char *) malloc(BUFSIZ); /* for I/O */
+     if (buf == NULL)
+         return PyErr_NoMemory();
+     ...Do some I/O operation involving buf...
+     res = PyString_FromString(buf);
+     free(buf); /* malloc'ed */
+     return res;
+ }
+ \end{verbatim}
+ 
+ In this example, the memory request for the I/O buffer is handled by
+ the C library allocator. The Python memory manager is involved only
+ in the allocation of the string object returned as a result.
+ 
+ In most situations, however, it is recommended to allocate memory from
+ the Python heap specifically because the latter is under control of
+ the Python memory manager. For example, this is required when the
+ interpreter is extended with new object types written in C. Another
+ reason for using the Python heap is the desire to \emph{inform} the
+ Python memory manager about the memory needs of the extension module.
+ Even when the requested memory is used exclusively for internal,
+ highly-specific purposes, delegating all memory requests to the Python
+ memory manager causes the interpreter to have a more accurate image of
+ its memory footprint as a whole. Consequently, under certain
+ circumstances, the Python memory manager may or may not trigger
+ appropriate actions, like garbage collection, memory compaction or
+ other preventive procedures. Note that by using the C library
+ allocator as shown in the previous example, the allocated memory for
+ the I/O buffer escapes completely the Python memory manager.
+ 
+ \section{Memory Interface \label{memoryInterface}}
+ 
+ The following function sets, modeled after the ANSI-C standard, are
+ available for allocating and releasing memory from the Python heap:
+ 
+ \begin{cfuncdesc}{ANY*}{PyMem_Malloc}{size_t n}
+ Allocates \var{n} bytes and returns a pointer of type \ctype{ANY*} to
+ the allocated memory, or \NULL{} if the request fails. Requesting zero
+ bytes returns a non-\NULL{} pointer.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{ANY*}{PyMem_Realloc}{ANY *p, size_t n}
+ Resizes the memory block pointed to by \var{p} to \var{n} bytes. The
+ contents will be unchanged to the minimum of the old and the new
+ sizes. If \var{p} is \NULL{}, the call is equivalent to
+ \cfunction{PyMem_Malloc(\var{n})}; if \var{n} is equal to zero, the memory block
+ is resized but is not freed, and the returned pointer is non-\NULL{}.
+ Unless \var{p} is \NULL{}, it must have been returned by a previous
+ call to \cfunction{PyMem_Malloc()} or \cfunction{PyMem_Realloc()}.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{void}{PyMem_Free}{ANY *p}
+ Frees the memory block pointed to by \var{p}, which must have been
+ returned by a previous call to \cfunction{PyMem_Malloc()} or
+ \cfunction{PyMem_Realloc()}.  Otherwise, or if
+ \cfunction{PyMem_Free(p)} has been called before, undefined behaviour
+ occurs. If \var{p} is \NULL{}, no operation is performed.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{ANY*}{Py_Malloc}{size_t n}
+ Same as \cfunction{PyMem_Malloc()}, but calls
+ \cfunction{PyErr_NoMemory()} on failure.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{ANY*}{Py_Realloc}{ANY *p, size_t n}
+ Same as \cfunction{PyMem_Realloc()}, but calls
+ \cfunction{PyErr_NoMemory()} on failure.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{void}{Py_Free}{ANY *p}
+ Same as \cfunction{PyMem_Free()}.
+ \end{cfuncdesc}
+ 
+ The following type-oriented macros are provided for convenience:
+ 
+ \begin{cfuncdesc}{TYPE*}{PyMem_NEW}{TYPE, size_t n}
+ Same as \cfunction{PyMem_Malloc()}, but allocates \var{(n *
+ sizeof(TYPE))} bytes of memory. Returns a pointer casted to
+ \ctype{TYPE*}.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{TYPE*}{PyMem_RESIZE}{ANY *p, TYPE, size_t n}
+ Same as \cfunction{PyMem_Realloc()}, but the memory block is resized
+ to \var{(n * sizeof(TYPE))} bytes. Returns a pointer casted to
+ \ctype{TYPE*}.
+ \end{cfuncdesc}
+ 
+ \begin{cfuncdesc}{void}{PyMem_DEL}{ANY *p}
+ Same as \cfunction{PyMem_Free()}.
+ \end{cfuncdesc}
+ 
+ 
+ \section{Examples \label{memoryExamples}}
+ 
+ Here is the example from section 1, rewritten so that the I/O buffer is
+ allocated from the Python heap by using the first function set:
+ 
+ \begin{verbatim}
+ {
+     PyObject *res;
+     char *buf = (char *) PyMem_Malloc(BUFSIZ); /* for I/O */
+     if (buf == NULL)
+         return PyErr_NoMemory();
+     ...Do some I/O operation involving buf...
+     res = PyString_FromString(buf);
+     PyMem_Free(buf); /* allocated with PyMem_Malloc */
+     return res;
+ }
+ \end{verbatim}
+ 
+ With the second function set, the need to call
+ \cfunction{PyErr_NoMemory()} is obviated:
+ 
+ \begin{verbatim}
+ {
+     PyObject *res;
+     char *buf = (char *) Py_Malloc(BUFSIZ); /* for I/O */
+     if (buf == NULL)
+         return NULL;
+     ...Do some I/O operation involving buf...
+     res = PyString_FromString(buf);
+     Py_Free(buf); /* allocated with Py_Malloc */
+     return res;
+ }
+ \end{verbatim}
+ 
+ The same code using the macro set:
+ 
+ \begin{verbatim}
+ {
+     PyObject *res;
+     char *buf = PyMem_NEW(char, BUFSIZ); /* for I/O */
+     if (buf == NULL)
+         return PyErr_NoMemory();
+     ...Do some I/O operation involving buf...
+     res = PyString_FromString(buf);
+     PyMem_DEL(buf); /* allocated with PyMem_NEW */
+     return res;
+ }
+ \end{verbatim}
+ 
+ Note that in the three examples above, the buffer is always
+ manipulated via functions/macros belonging to the same set. Indeed, it
+ is highly recommended to use the same memory API family for a given
+ memory block, so that the risk of mixing different allocators is
+ reduced to a minimum. The following code sequence contains two errors,
+ one of which is labeled as \emph{fatal} because it mixes two different
+ allocators operating on different heaps.
+ 
+ \begin{verbatim}
+ char *buf1 = PyMem_NEW(char, BUFSIZ);
+ char *buf2 = (char *) malloc(BUFSIZ);
+ char *buf3 = (char *) PyMem_Malloc(BUFSIZ);
+ ...
+ PyMem_DEL(buf3);  /* Wrong -- should be PyMem_Free() */
+ free(buf2);       /* Right -- allocated via malloc() */
+ free(buf1);       /* Fatal -- should be PyMem_DEL()  */
+ \end{verbatim}
+ 
+ In addition to the functions aimed at handling raw memory blocks from
+ the Python heap, objects in Python are allocated and released with
+ \cfunction{_PyObject_New()}, \cfunction{_PyObject_NewVar()},
+ \cfunction{_PyObject_Del()}, or with their corresponding macros
+ \cfunction{PyObject_NEW()}, \cfunction{PyObject_NEW_VAR()},
+ \cfunction{PyObject_DEL()}.
+ 
+ % These will be explained in the next chapter on defining and
+ % implementing new object types in C.
  
  



From fdrake@weyr.cnri.reston.va.us  Tue Feb 29 15:57:58 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 29 Feb 2000 10:57:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.13,1.56.2.14
Message-ID: <200002291557.KAA28645@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p2/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Oops, better add in the appropriate \sectionauthor for Vladimir!


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.13
retrieving revision 1.56.2.14
diff -C2 -r1.56.2.13 -r1.56.2.14
*** api.tex	2000/02/29 15:53:03	1.56.2.13
--- api.tex	2000/02/29 15:57:55	1.56.2.14
***************
*** 3247,3250 ****
--- 3247,3251 ----
  
  \chapter{Memory Management \label{memory}}
+ \sectionauthor{Vladimir Marangozov}{Vladimir.Marangozov@inrialpes.fr}
  
  \section{Overview \label{memoryOverview}}



From fdrake@weyr.cnri.reston.va.us  Tue Feb 29 16:12:58 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 29 Feb 2000 11:12:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/api api.tex,1.56.2.14,1.56.2.15
Message-ID: <200002291612.LAA28762@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/api
In directory weyr:/home/fdrake/projects/python/Doc-152p2/api

Modified Files:
      Tag: release152p1-patches
	api.tex 
Log Message:

Adjustment from Vladimir so that 1.6 API isn't documented for 1.5.2.

Added XXX comment to look at after merging changes for 1.6 docs.


Index: api.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/api/api.tex,v
retrieving revision 1.56.2.14
retrieving revision 1.56.2.15
diff -C2 -r1.56.2.14 -r1.56.2.15
*** api.tex	2000/02/29 15:57:55	1.56.2.14
--- api.tex	2000/02/29 16:12:55	1.56.2.15
***************
*** 3453,3460 ****
  In addition to the functions aimed at handling raw memory blocks from
  the Python heap, objects in Python are allocated and released with
! \cfunction{_PyObject_New()}, \cfunction{_PyObject_NewVar()},
! \cfunction{_PyObject_Del()}, or with their corresponding macros
! \cfunction{PyObject_NEW()}, \cfunction{PyObject_NEW_VAR()},
! \cfunction{PyObject_DEL()}.
  
  % These will be explained in the next chapter on defining and
--- 3453,3465 ----
  In addition to the functions aimed at handling raw memory blocks from
  the Python heap, objects in Python are allocated and released with
! \cfunction{_PyObject_New()} and \cfunction{_PyObject_NewVar()}, or
! with their corresponding macros
! \cfunction{PyObject_NEW()} and \cfunction{PyObject_NEW_VAR()}.
! 
! % XXX use this for Python 1.6:
! % \cfunction{_PyObject_New()}, \cfunction{_PyObject_NewVar()},
! % \cfunction{_PyObject_Del()}, or with their corresponding macros
! % \cfunction{PyObject_NEW()}, \cfunction{PyObject_NEW_VAR()},
! % \cfunction{PyObject_DEL()}.
  
  % These will be explained in the next chapter on defining and



From fdrake@weyr.cnri.reston.va.us  Tue Feb 29 18:40:58 2000
From: fdrake@weyr.cnri.reston.va.us (Fred L. Drake)
Date: Tue, 29 Feb 2000 13:40:58 -0500 (EST)
Subject: [Python-checkins] CVS: python/dist/src/Doc/ext ext.tex,1.68.2.6,1.68.2.7
Message-ID: <200002291840.NAA29275@weyr.cnri.reston.va.us>

Update of /projects/cvsroot/python/dist/src/Doc/ext
In directory weyr:/home/fdrake/projects/python/Doc-152p2/ext

Modified Files:
      Tag: release152p1-patches
	ext.tex 
Log Message:

Integrate some feedback from Eddy Welbourne <eddyw@lsl.co.uk>:

  - extraneous "by" in text around a simple example
  - don't imply that errno is Unix-specific; it's ANSI C
  - clarify statement about malloc() & realloc() callers needing to
    raise the appropriate exception


Index: ext.tex
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Doc/ext/ext.tex,v
retrieving revision 1.68.2.6
retrieving revision 1.68.2.7
diff -C2 -r1.68.2.6 -r1.68.2.7
*** ext.tex	2000/02/16 17:25:40	1.68.2.6
--- ext.tex	2000/02/29 18:40:55	1.68.2.7
***************
*** 163,167 ****
  whose addresses are passed.  It returns false (zero) if an invalid
  argument list was passed.  In the latter case it also raises an
! appropriate exception by so the calling function can return
  \NULL{} immediately (as we saw in the example).
  
--- 163,167 ----
  whose addresses are passed.  It returns false (zero) if an invalid
  argument list was passed.  In the latter case it also raises an
! appropriate exception so the calling function can return
  \NULL{} immediately (as we saw in the example).
  
***************
*** 196,200 ****
  Another useful function is \cfunction{PyErr_SetFromErrno()}, which only
  takes an exception argument and constructs the associated value by
! inspection of the (\UNIX{}) global variable \cdata{errno}.  The most
  general function is \cfunction{PyErr_SetObject()}, which takes two object
  arguments, the exception and its associated value.  You don't need to
--- 196,200 ----
  Another useful function is \cfunction{PyErr_SetFromErrno()}, which only
  takes an exception argument and constructs the associated value by
! inspection of the global variable \cdata{errno}.  The most
  general function is \cfunction{PyErr_SetObject()}, which takes two object
  arguments, the exception and its associated value.  You don't need to
***************
*** 232,241 ****
  nothing happened).
  
! Note that a failing \cfunction{malloc()} call must be turned into an
  exception --- the direct caller of \cfunction{malloc()} (or
  \cfunction{realloc()}) must call \cfunction{PyErr_NoMemory()} and
  return a failure indicator itself.  All the object-creating functions
! (\cfunction{PyInt_FromLong()} etc.) already do this, so only if you
! call \cfunction{malloc()} directly this note is of importance.
  
  Also note that, with the important exception of
--- 232,241 ----
  nothing happened).
  
! Every failing \cfunction{malloc()} call must be turned into an
  exception --- the direct caller of \cfunction{malloc()} (or
  \cfunction{realloc()}) must call \cfunction{PyErr_NoMemory()} and
  return a failure indicator itself.  All the object-creating functions
! (for example, \cfunction{PyInt_FromLong()}) already do this, so this
! note is only relevant to those who call \cfunction{malloc()} directly.
  
  Also note that, with the important exception of