Patches #1298449 and #1298499: Add some missing checks for error
returns in cStringIO.c.  Thanks to Andrew Bennetts.

This must be a backport candidate.

* Added note about Python 2.2 compatibility.

* Changed license header: Now simply referring to PSF. This closes bug
  1138653.

Fix bug:

[ 1163563 ] Sub threads execute in restricted mode

basically by fixing bug 1010677 in a non-broken way.

Backport candidate.

Backport SF #1297059, doc incorrect return type for search() method.  (There is a description of returned values at the top, so just remove the sentance and correct an example.)

functions, causing the profiler to crash on an AssertionError if the same
Python function catches multiple exceptions from C functions.

with an exception currently set!

  represented as a C int, raise OverflowError.
(Will forward-port.)

test_default_encoding_issues():  Fully restore sys.setdefaultencoding.

test_site often failed under "regrtest.py -r", because this xmlrpc test
left sys with a setdefaultencoding attribute, but loading site.py removes
that attribute and test_site.py verifies the attribute is gone.  Changed
this test to get rid of sys.setdefaultencoding if it didn't exist when
this test started.

  to get the correct encoding.

- Patch #1166938: locale.py: Parse LANGUAGE as a colon separated list of
  languages.

 * Fix memory leak in posix.access()
 * Fix use of uninitialized value in forkpty()
   - from the manpage it isn't clear if there are conditions where master_fd
     are uninitialized, but it's safer to initialize

considering it exactly like a '*'.

Backport from 2.5 branch.