python
diff --git a/‎Demo/threads/README‎
Lines changed: 0 additions & 2 deletions b/‎Demo/threads/README‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎Doc/Makefile.deps‎
Lines changed: 0 additions & 1 deletion b/‎Doc/Makefile.deps‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎Doc/api/concrete.tex‎
Lines changed: 4 additions & 4 deletions b/‎Doc/api/concrete.tex‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎Doc/dist/dist.tex‎
Lines changed: 19 additions & 3 deletions b/‎Doc/dist/dist.tex‎
Lines changed: 19 additions & 3 deletions
diff --git a/‎Doc/lib/lib.tex‎
Lines changed: 0 additions & 5 deletions b/‎Doc/lib/lib.tex‎
Lines changed: 0 additions & 5 deletions
diff --git a/‎Doc/lib/libamoeba.tex‎
Lines changed: 0 additions & 131 deletions b/‎Doc/lib/libamoeba.tex‎
Lines changed: 0 additions & 131 deletions
diff --git a/‎Doc/lib/libdifflib.tex‎
Lines changed: 1 addition & 1 deletion b/‎Doc/lib/libdifflib.tex‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Doc/lib/libexcs.tex‎
Lines changed: 6 additions & 16 deletions b/‎Doc/lib/libexcs.tex‎
Lines changed: 6 additions & 16 deletions
diff --git a/‎Doc/lib/liblogging.tex‎
Lines changed: 6 additions & 3 deletions b/‎Doc/lib/liblogging.tex‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎Doc/lib/libos.tex‎
Lines changed: 18 additions & 12 deletions b/‎Doc/lib/libos.tex‎
Lines changed: 18 additions & 12 deletions
@@ -3,10 +3,8 @@ This directory contains some demonstrations of the thread module.
 These are mostly "proof of concept" type applications:
 
 Generator.py	Generator class implemented with threads.
-find.py		Parallelized "find(1)" (looks for directories).
 sync.py		Condition variables primitives by Tim Peters.
 telnet.py	Version of ../sockets/telnet.py using threads.
-wpi.py		Version of ../scripts/pi.py using threads (needs stdwin).
 
 Coroutine.py	Coroutines using threads, by Tim Peters (22 May 94)
 fcmp.py		Example of above, by Tim
 
@@ -204,7 +204,6 @@ LIBFILES= $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
 	lib/libcrypto.tex \
 	lib/libhashlib.tex \
 	lib/libhmac.tex \
-	lib/libstdwin.tex \
 	lib/libsun.tex \
 	lib/libxdrlib.tex \
 	lib/libimghdr.tex \
 
@@ -1188,10 +1188,10 @@ \subsubsection{Built-in Codecs \label{builtinCodecs}}
    *byteorder == 1:  big endian
 \end{verbatim}
 
-  and then switches according to all byte order marks (BOM) it finds
-  in the input data.  BOMs are not copied into the resulting Unicode
-  string.  After completion, \var{*byteorder} is set to the current
-  byte order at the end of input data.
+  and then switches if the first two bytes of the input data are a byte order
+  mark (BOM) and the specified byte order is native order.  This BOM is not
+  copied into the resulting Unicode string.  After completion, \var{*byteorder}
+  is set to the current byte order at the.
 
   If \var{byteorder} is \NULL{}, the codec starts in native order mode.
 
 
@@ -486,9 +486,24 @@ \subsection{Extension source files}
 extensions: it will run SWIG on the interface file and compile the
 resulting C/\Cpp{} file into your extension.
 
-\XXX{SWIG support is rough around the edges and largely untested;
-  especially SWIG support for \Cpp{} extensions!  Explain in more detail
-  here when the interface firms up.}
+\XXX{SWIG support is rough around the edges and largely untested!}
+
+This warning notwithstanding, options to SWIG can be currently passed
+like this:
+
+\begin{verbatim}
+setup(...
+      ext_modules=[Extension('_foo', ['foo.i'], 
+                             swig_opts=['-modern', '-I../include'])],
+      py_modules=['foo'],
+     )
+\end{verbatim}
+
+Or on the commandline like this:
+
+\begin{verbatim}
+> python setup.py build_ext --swig-opts="-modern -I../include"
+\end{verbatim}
 
 On some platforms, you can include non-source files that are processed
 by the compiler and included in your extension.  Currently, this just
@@ -1017,6 +1032,7 @@ \chapter{Writing the Setup Configuration File}
   --include-dirs (-I)  list of directories to search for header files
   --define (-D)        C preprocessor macros to define
   --undef (-U)         C preprocessor macros to undefine
+  --swig-opts          list of SWIG command line options        
 [...]
 \end{verbatim}
 
 
@@ -423,11 +423,6 @@ \chapter*{Front Matter\label{front}}
 % OTHER PLATFORM-SPECIFIC STUFF
 % =============
 
-% XXX(nnorwitz): all these modules (down to next comment) need to be (re)moved.
-%\input{libamoeba}              % AMOEBA ONLY
-
-%\input{libstdwin}              % STDWIN ONLY
-
 \input{libsun}                  % SUNOS ONLY
 \input{libsunaudio}
 % XXX(nnorwitz): the modules below this comment should be kept.
 
@@ -302,7 +302,7 @@ \section{\module{difflib} ---
 
 
 \begin{seealso}
-  \seetitle[http://www.ddj.com/documents/s=1103/ddj8807c/]
+  \seetitle[http://www.ddj.com/184407970?pgno=5]
            {Pattern Matching: The Gestalt Approach}{Discussion of a
             similar algorithm by John W. Ratcliff and D. E. Metzener.
             This was published in
 
@@ -23,14 +23,10 @@ \section{Built-in Exceptions}
 This may be a string or a tuple containing several items of
 information (e.g., an error code and a string explaining the code).
 The associated value is the second argument to the
-\keyword{raise}\stindex{raise} statement.  For string exceptions, the
-associated value itself will be stored in the variable named as the
-second argument of the \keyword{except} clause (if any).  For class
-exceptions, that variable receives the exception instance.  If the
-exception class is derived from the standard root class
-\exception{BaseException}, the associated value is present as the
-exception instance's \member{args} attribute.  If there is a single argument
-(as is preferred), it is bound to the \member{message} attribute.
+\keyword{raise}\stindex{raise} statement.  If the exception class is
+derived from the standard root class \exception{BaseException}, the
+associated value is present as the exception instance's \member{args}
+attribute.
 
 User code can raise built-in exceptions.  This can be used to test an
 exception handler or to report an error condition ``just like'' the
@@ -56,14 +52,8 @@ \section{Built-in Exceptions}
 inherited by user-defined classes (for that use \exception{Exception}).  If
 \function{str()} or \function{unicode()} is called on an instance of this
 class, the representation of the argument(s) to the instance are returned or
-the emptry string when there were no arguments.  If only a single argument is
-passed in, it is stored in the \member{message} attribute.  If more than one
-argument is passed in, \member{message} is set to the empty string.  These
-semantics are meant to reflect the fact that \member{message} is to store a
-text message explaining why the exception had been raised.  If more data needs
-to be attached to the exception, attach it through arbitrary attributes on the
-instance.  All arguments are also stored in \member{args} as a tuple, but it will
-eventually be deprecated and thus its use is discouraged.
+the emptry string when there were no arguments.  All arguments are 
+stored in \member{args} as a tuple.
 \versionadded{2.5}
 \end{excdesc}
 
 
@@ -203,7 +203,7 @@ \section{\module{logging} ---
 \begin{verbatim}
  FORMAT = "%(asctime)-15s %(clientip)s %(user)-8s %(message)s"
  logging.basicConfig(format=FORMAT)
- dict = { 'clientip' : '192.168.0.1', 'user' : 'fbloggs' }
+ d = {'clientip': '192.168.0.1', 'user': 'fbloggs'}
  logging.warning("Protocol problem: %s", "connection reset", extra=d)
 \end{verbatim}
 
@@ -1296,13 +1296,16 @@ \subsubsection{SMTPHandler}
 \module{logging.handlers} module, supports sending logging messages to
 an email address via SMTP.
 
-\begin{classdesc}{SMTPHandler}{mailhost, fromaddr, toaddrs, subject}
+\begin{classdesc}{SMTPHandler}{mailhost, fromaddr, toaddrs, subject\optional{,
+                               credentials}}
 Returns a new instance of the \class{SMTPHandler} class. The
 instance is initialized with the from and to addresses and subject
 line of the email. The \var{toaddrs} should be a list of strings. To specify a
 non-standard SMTP port, use the (host, port) tuple format for the
 \var{mailhost} argument. If you use a string, the standard SMTP port
-is used.
+is used. If your SMTP server requires authentication, you can specify a
+(username, password) tuple for the \var{credentials} argument.
+\versionchanged[\var{credentials} was added]{2.6}
 \end{classdesc}
 
 \begin{methoddesc}{emit}{record}
 
@@ -361,9 +361,8 @@ \subsection{File Object Creation \label{os-newstreams}}
 errors), \code{None} is returned.
 Availability: Macintosh, \UNIX, Windows.
 
-The \module{subprocess} module provides more powerful facilities for
-spawning new processes and retrieving their results; using that module
-is preferable to using this function.
+\deprecated{2.6}{This function is obsolete.  Use the
+                 \module{subprocess} module.}
 
 \versionchanged[This function worked unreliably under Windows in
   earlier versions of Python.  This was due to the use of the
@@ -380,10 +379,9 @@ \subsection{File Object Creation \label{os-newstreams}}
 \end{funcdesc}
 
 There are a number of different \function{popen*()} functions that
-provide slightly different ways to create subprocesses.  Note that the
-\module{subprocess} module is easier to use and more powerful;
-consider using that module before writing code using the
-lower-level \function{popen*()} functions.
+provide slightly different ways to create subprocesses.
+\deprecated{2.6}{All of the \function{popen*()} functions are obsolete.
+                 Use the \module{subprocess} module.}
 
 For each of the \function{popen*()} variants, if \var{bufsize} is
 specified, it specifies the buffer size for the I/O pipes.
@@ -400,8 +398,7 @@ \subsection{File Object Creation \label{os-newstreams}}
 These methods do not make it possible to retrieve the exit status from
 the child processes.  The only way to control the input and output
 streams and also retrieve the return codes is to use the
-\class{Popen3} and \class{Popen4} classes from the \refmodule{popen2}
-module; these are only available on \UNIX.
+\refmodule{subprocess} module; these are only available on \UNIX.
 
 For a discussion of possible deadlock conditions related to the use
 of these functions, see ``\ulink{Flow Control
@@ -411,20 +408,26 @@ \subsection{File Object Creation \label{os-newstreams}}
 \begin{funcdesc}{popen2}{cmd\optional{, mode\optional{, bufsize}}}
 Executes \var{cmd} as a sub-process.  Returns the file objects
 \code{(\var{child_stdin}, \var{child_stdout})}.
+\deprecated{2.6}{All of the \function{popen*()} functions are obsolete.
+                 Use the \module{subprocess} module.}
 Availability: Macintosh, \UNIX, Windows.
 \versionadded{2.0}
 \end{funcdesc}
 
 \begin{funcdesc}{popen3}{cmd\optional{, mode\optional{, bufsize}}}
 Executes \var{cmd} as a sub-process.  Returns the file objects
 \code{(\var{child_stdin}, \var{child_stdout}, \var{child_stderr})}.
+\deprecated{2.6}{All of the \function{popen*()} functions are obsolete.
+                 Use the \module{subprocess} module.}
 Availability: Macintosh, \UNIX, Windows.
 \versionadded{2.0}
 \end{funcdesc}
 
 \begin{funcdesc}{popen4}{cmd\optional{, mode\optional{, bufsize}}}
 Executes \var{cmd} as a sub-process.  Returns the file objects
 \code{(\var{child_stdin}, \var{child_stdout_and_stderr})}.
+\deprecated{2.6}{All of the \function{popen*()} functions are obsolete.
+                 Use the \module{subprocess} module.}
 Availability: Macintosh, \UNIX, Windows.
 \versionadded{2.0}
 \end{funcdesc}
@@ -2006,9 +2009,12 @@ \subsection{Miscellaneous System Information \label{os-path}}
 
 \begin{datadesc}{linesep}
 The string used to separate (or, rather, terminate) lines on the
-current platform.  This may be a single character, such as \code{'\e
-n'} for \POSIX{} or \code{'\e r'} for Mac OS, or multiple characters,
-for example, \code{'\e r\e n'} for Windows.
+current platform.  This may be a single character, such as 
+\code{'\e n'} for \POSIX{} or \code{'\e r'} for Mac OS, or multiple 
+characters, for example, \code{'\e r\e n'} for Windows.
+Do not use \var{os.linesep} as a line terminator when writing files 
+opened in text mode (the default); use a single \code{'\e n'} instead, 
+on all platforms. 
 \end{datadesc}
 
 \begin{datadesc}{devnull}