Merge with 3.1

author: Ronald Oussoren <ronaldoussoren@mac.com> 2011-03-16 09:43:06 -0400
committer: Ronald Oussoren <ronaldoussoren@mac.com> 2011-03-16 09:43:06 -0400
commit: 9d594ca842ed3426393a24236e8452fc0532f527 (patch)
tree: be6b249858fb277f0cc512d49b7f54ee439a3dae /Misc
parent: c04ce0236c49d9f712ab8e4f11758d0b7d35154d (diff)
parent: 5c23d8fb736f0c55edec98df2030117bea152326 (diff)
download: cpython-9d594ca842ed3426393a24236e8452fc0532f527.tar.gz
23 files changed, 3589 insertions, 4434 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index e5ee8710b0..5c1bdc5904 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -12,19 +12,26 @@ PS: In the standard Python distribution, this file is encoded in UTF-8
 and the list is in rough alphabetical order by last names.
 
 David Abrahams
+Ron Adam
 Jim Ahlstrom
 Farhan Ahmad
+Matthew Ahrens
+Nir Aides
 Yaniv Aknin
 Jyrki Alakuijala
+Ray Allen
 Billy G. Allie
 Kevin Altis
 Joe Amenta
 Mark Anacker
+Shashwat Anand
 Anders Andersen
 John Anderson
 Erik Andersén
 Oliver Andrich
 Ross Andrus
+Jon Anglin
+Éric Araujo
 Jason Asbahr
 David Ascher
 Chris AtLee
@@ -73,6 +80,7 @@ Steven Bethard
 Stephen Bevan
 Ron Bickers
 Natalia B. Bidart
+Adrian von Bidder
 David Binger
 Dominic Binks
 Philippe Biondi
@@ -88,19 +96,23 @@ Paul Boddie
 Matthew Boedicker
 David Bolen
 Forest Bond
+Gawain Bolton
 Gregory Bond
 Jurjen Bos
 Peter Bosch
 Eric Bouck
 Thierry Bousch
 Sebastian Boving
+Jeff Bradberry
 Monty Brandenberg
 Georg Brandl
 Christopher Brannon
 Terrence Brannon
+Brian Brazil
 Dave Brennan
 Tom Bridgman
 Richard Brodie
+Michael Broghton
 Daniel Brotsky
 Jean Brouwers
 Gary S. Brown
@@ -125,6 +137,7 @@ Mike Carlton
 Terry Carroll
 Lorenzo M. Catucci
 Donn Cave
+Charles Cazabon
 Per Cederqvist
 Octavian Cerna
 Pascal Chambon
@@ -141,6 +154,7 @@ Michael Chermside
 Albert Chin-A-Young
 Adal Chiriliuc
 Matt Chisholm
+Anders Chrigström
 Tom Christiansen
 Vadim Chugunov
 David Cinege
@@ -154,10 +168,14 @@ Dave Cole
 Terrence Cole
 Benjamin Collar
 Jeffery Collins
+Robert Collins
 Paul Colomiets
 Denver Coneybeare
+Geremy Condra
+Juan José Conti
 Matt Conway
 David M. Cooke
+Jason R. Coombs
 Greg Copeland
 Aldo Cortesi
 David Costanzo
@@ -175,6 +193,8 @@ Drew Csillag
 Joaquin Cuenca Abela
 John Cugini
 Tom Culliton
+Antonio Cuni
+Brian Curtin
 Lisandro Dalcin
 Andrew Dalke
 Lars Damerow
@@ -190,6 +210,7 @@ Arnaud Delobelle
 Erik Demaine
 Roger Dev
 Raghuram Devarakonda
+Caleb Deveraux
 Catherine Devlin
 Scott Dial
 Toby Dickenson
@@ -201,6 +222,7 @@ Yves Dionne
 Daniel Dittmar
 Jaromir Dolecek
 Ismail Donmez
+Marcos Donolo
 Dima Dorfman
 Cesar Douady
 Dean Draayer
@@ -220,10 +242,12 @@ Josip Dzolonga
 Maxim Dzumanenko
 Walter Dörwald
 Hans Eckardt
+Rodolpho Eckhardt
 Grant Edwards
 John Ehresman
 Eric Eisner
 Andrew Eland
+Julien Élie
 Lance Ellinghaus
 David Ely
 Jeff Epler
@@ -248,6 +272,7 @@ Troy J. Farrell
 Mark Favas
 Niels Ferguson
 Sebastian Fernandez
+Florian Festi
 Vincent Fiack
 Tomer Filiba
 Jeffrey Finkelstein
@@ -294,6 +319,7 @@ Dinu Gherman
 Jonathan Giddy
 Johannes Gijsbers
 Michael Gilfix
+Christoph Gohlke
 Tim Golden
 Chris Gonnerman
 David Goodger
@@ -301,6 +327,7 @@ Hans de Graaff
 Eddy De Greef
 Duncan Grisby
 Fabian Groffen
+Eric Groo
 Dag Gruneau
 Michael Guravage
 Lars Gustäbel
@@ -321,6 +348,7 @@ Barry Hantman
 Lynda Hardman
 Derek Harland
 Jason Harper
+Brian Harring
 Larry Hastings
 Shane Hathaway
 Rycharde Hawkes
@@ -343,6 +371,7 @@ Kevan Heydon
 Jason Hildebrand
 Richie Hindle
 Konrad Hinsen
+Michael Henry
 David Hobley
 Tim Hochberg
 Joerg-Cyril Hoehle
@@ -382,8 +411,9 @@ Tony Ingraldi
 John Interrante
 Bob Ippolito
 Atsuo Ishimoto
-Paul Jackson
+Adam Jackson
 Ben Jackson
+Paul Jackson
 David Jacobs
 Kevin Jacobs
 Kjetil Jacobsen
@@ -393,7 +423,7 @@ Jack Jansen
 Bill Janssen
 Drew Jenkins
 Flemming Kjær Jensen
-Jiba
+MunSic Jeong
 Orjan Johansen
 Fredrik Johansson
 Gregory K. Johnson
@@ -413,8 +443,8 @@ Bob Kahn
 Kurt B. Kaiser
 Tamito Kajiyama
 Peter van Kampen
+Rafe Kaplan
 Jacob Kaplan-Moss
-Piotr Kasprzyk
 Lou Kates
 Hiroaki Kawai
 Sebastien Keim
@@ -432,6 +462,7 @@ Paul Kippes
 Steve Kirsch
 Sebastian Kirsche
 Ron Klatchko
+Reid Kleckner
 Bastian Kleineidam
 Bob Kline
 Matthias Klose
@@ -440,8 +471,10 @@ Lenny Kneler
 Pat Knight
 Greg Kochanski
 Damon Kohler
+Vlad Korolev
 Joseph Koshy
 Maksim Kozyarchuk
+Stefan Krah
 Bob Kras
 Holger Krekel
 Michael Kremer
@@ -453,6 +486,8 @@ Andrew Kuchling
 Vladimir Kushnir
 Ross Lagerwall
 Cameron Laird
+Jean-Baptiste "Jiba" Lamy
+Torsten Landschoff
 Łukasz Langa
 Tino Lange
 Andrew Langmead
@@ -473,6 +508,7 @@ Luc Lefebvre
 Vincent Legoll
 Kip Lehman
 Joerg Lehmann
+Robert Lehmann
 Luke Kenneth Casson Leighton
 Marc-Andre Lemburg
 John Lenton
@@ -517,6 +553,7 @@ David Marek
 Doug Marien
 Alex Martelli
 Anthony Martin
+Owen Martin
 Sébastien Martini
 Roger Masse
 Nick Mathewson
@@ -535,6 +572,7 @@ Craig McPheeters
 Lambert Meertens
 Bill van Melle
 Lucas Prado Melo
+Ezio Melotti
 Brian Merrell
 Luke Mewburn
 Mike Meyer
@@ -556,9 +594,11 @@ Skip Montanaro
 Paul Moore
 Derek Morr
 James A Morrison
+Pablo Mouzo
 Sjoerd Mullender
 Sape Mullender
 Michael Muller
+Neil Muller
 R. David Murray
 Piotr Meyer
 John Nagle
@@ -576,6 +616,7 @@ Samuel Nicolary
 Gustavo Niemeyer
 Oscar Nierstrasz
 Hrvoje Niksic
+Gregory Nofi
 Jesse Noller
 Bill Noon
 Stefan Norberg
@@ -630,6 +671,7 @@ Neale Pickett
 Jim St. Pierre
 Dan Pierson
 Martijn Pieters
+Anand B. Pillai
 François Pinard
 Zach Pincus
 Michael Piotrowski
@@ -645,6 +687,7 @@ Donovan Preston
 Steve Purcell
 Fernando Pérez
 Eduardo Pérez
+Pierre Quentel
 Brian Quinlan
 Anders Qvist
 Burton Radons
@@ -658,6 +701,7 @@ Marc Recht
 John Redford
 Terry Reedy
 Steve Reeves
+Lennart Regebro
 Ofir Reichenberg
 Sean Reifschneider
 Michael P. Reilly
@@ -665,6 +709,7 @@ Bernhard Reiter
 Steven Reiz
 Roeland Rengelink
 Tim Rice
+Francesco Ricciardi
 Jan Pieter Riegel
 Armin Rigo
 Nicholas Riley
@@ -674,6 +719,7 @@ Anthony Roach
 Mark Roberts
 Jim Robinson
 Andy Robinson
+Mark Roddy
 Kevin Rodgers
 Giampaolo Rodola
 Mike Romberg
@@ -690,6 +736,7 @@ Craig Rowland
 Clinton Roy
 Paul Rubin
 Sam Ruby
+Demur Rumed
 Audun S. Runde
 Rauli Ruohonen
 Jeff Rush
@@ -701,14 +748,17 @@ Hajime Saitou
 George Sakkis
 Rich Salz
 Kevin Samborn
+Adrian Sampson
 Ilya Sandler
 Mark Sapiro
 Ty Sarna
 Ben Sayer
+Andrew Schaaf
 Michael Scharf
 Andreas Schawo
 Neil Schemenauer
 David Scherer
+Bob Schmertz
 Gregor Schmid
 Ralf Schmitt
 Michael Schneider
@@ -723,6 +773,7 @@ Steven Scott
 Barry Scott
 Nick Seidenman
 Žiga Seilnach
+Yury Selivanov
 Fred Sells
 Jiwon Seo
 Roger D. Serwy
@@ -730,6 +781,7 @@ Jerry Seutter
 Denis Severson
 Ian Seyer
 Ha Shao
+Richard Shapiro
 Bruce Sherwood
 Alexander Shigin
 Pete Shinners
@@ -771,6 +823,7 @@ Michael Stone
 Ken Stox
 Dan Stromberg
 Daniel Stutzbach
+Andreas Stührk
 Pal Subbiah
 Nathan Sullivan
 Mark Summerfield
@@ -782,6 +835,7 @@ Paul Swartz
 Thenault Sylvain
 Péter Szabó
 Arfrever Frehtes Taifersar Arahesis
+Neil Tallim
 Geoff Talvola
 Musashi Tamura
 William Tanksley
@@ -789,10 +843,13 @@ Christian Tanzer
 Steven Taschuk
 Monty Taylor
 Amy Taylor
+Anatoly Techtonik
 Tobias Thelen
 James Thomas
 Robin Thomas
+Jeremy Thurgood
 Eric Tiedemann
+July Tikhonov
 Tracy Tims
 Oren Tirosh
 Jason Tishler
@@ -800,6 +857,7 @@ Christian Tismer
 Frank J. Tobin
 R Lindsay Todd
 Bennett Todd
+Matias Torchinsky
 Sandro Tosi
 Richard Townsend
 Laurence Tratt
@@ -807,21 +865,27 @@ John Tromp
 Jason Trowbridge
 Anthony Tuininga
 Stephen Turner
+Theodore Turocy
 Bill Tutt
 Doobee R. Tzeck
 Eren Türkay
 Lionel Ulmer
 Roger Upole
+Daniel Urban
 Michael Urman
 Hector Urtubia
 Andi Vajda
+Case Van Horsen
 Kyle VanderBeek
+Andrew Vant
 Atul Varma
 Dmitry Vasiliev
 Alexandre Vassalotti
+Nadeem Vawda
 Frank Vercruesse
 Mike Verdone
 Jaap Vermeulen
+Nikita Vetoshkin
 Al Vezza
 Jacques A. Vidrine
 John Viega
@@ -834,6 +898,7 @@ Wojtek Walczak
 Charles Waldman
 Richard Walker
 Larry Wall
+Kevin Walzer
 Rodrigo Steinmuller Wanderley
 Greg Ward
 Barry Warsaw
@@ -868,7 +933,9 @@ Collin Winter
 Dik Winter
 Blake Winton
 Jean-Claude Wippler
+Frank Wierzbicki
 Lars Wirzenius
+John Wiseman
 Chris Withers
 Stefan Witzel
 Irek Wlizlo
@@ -881,6 +948,7 @@ Gordon Worley
 Thomas Wouters
 Heiko Wundram
 Doug Wyatt
+Florent Xicluna
 Hirokazu Yamamoto
 Ka-Ping Yee
 Bob Yodlowski
diff --git a/Misc/NEWS b/Misc/NEWS
index d5c4699b68..bd21c5c71c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,44 +2,47 @@
 Python News
 +++++++++++
 
-What's New in Python 3.1.4?
+What's New in Python 3.2.1?
 ===========================
 
-*Release date: XXXX-XX-XX*
+*Release date: XX-XXX-20XX*
 
 Core and Builtins
 -----------------
 
+- Issue #11510: Fixed optimizer bug which turned "a,b={1,1}" into "a,b=(1,1)".
+
+- Issue #11432: A bug was introduced in subprocess.Popen on posix systems with
+  3.2.0 where the stdout or stderr file descriptor being the same as the stdin
+  file descriptor would raise an exception. webbrowser.open would fail. fixed.
+
 - Issue #11450: Don't truncate hg version info in Py_GetBuildInfo() when
   there are many tags (e.g. when using mq).  Patch by Nadeem Vawda.
 
-- Issue #10451: memoryview objects could allow to mutate a readable buffer.
-  Initial patch by Ross Lagerwall.
+- Issue #11246: Fix PyUnicode_FromFormat("%V") to decode the byte string from
+  UTF-8 (with replace error handler) instead of ISO-8859-1 (in strict mode).
+  Patch written by Ray Allen.
 
-- Issue #10892: Don't segfault when trying to delete __abstractmethods__ from a
-  class.
+- Issue #11286: Raise a ValueError from calling PyMemoryView_FromBuffer with
+  a buffer struct having a NULL data pointer.
 
-- Issue #8020: Avoid a crash where the small objects allocator would read
-  non-Python managed memory while it is being modified by another thread.
-  Patch by Matt Bandy.
+- Issue #11272: On Windows, input() strips '\r' (and not only '\n'), and
+  sys.stdin uses universal newline (replace '\r\n' by '\n').
 
-- Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime()
-  can now handle dates after 2038.
+- Issue #10830: Fix PyUnicode_FromFormatV("%c") for non-BMP characters on
+  narrow build.
 
-- Issue #4236: PyModule_Create2 now checks the import machinery directly
-  rather than the Py_IsInitialized flag, avoiding a Fatal Python
-  error in certain circumstances when an import is done in __del__.
+- Check for NULL result in PyType_FromSpec.
 
-- Issue #10596: Fix float.__mod__ to have the same behaviour as
-  float.__divmod__ with respect to signed zeros.  -4.0 % 4.0 should be
-  0.0, not -0.0.
-
-- Issue #5587: add a repr to dict_proxy objects.  Patch by David Stanek and
-  Daniel Urban.
+- Issue #11386: bytearray.pop() now throws IndexError when the bytearray is
+  empty, instead of OverflowError.
 
 Library
 -------
 
+- Issue #11133: fix two cases where inspect.getattr_static can trigger code
+  execution. Patch by Daniel Urban.
+
 - Issue #11569: use absolute path to the sysctl command in multiprocessing to
   ensure that it will be found regardless of the shell PATH. This ensures
   that multiprocessing.cpu_count works on default installs of MacOSX.
@@ -48,10 +51,16 @@ Library
   not installed. Instead, the zipfile.ZIP_STORED compression is used to create
   the ZipFile. Patch by Natalia B. Bidart.
 
+- Issue #11554: Fixed support for Japanese codecs; previously the body output
+  encoding was not done if euc-jp or shift-jis was specified as the charset.
+
+- Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified
+  IP addresses in the proxy exception list.
+
 - Issue #11491: dbm.error is no longer raised when dbm.open is called with
   the "n" as the flag argument and the file exists. The behavior matches
   the documentation and general logic.
-   
+
 - Issue #11131: Fix sign of zero in decimal.Decimal plus and minus
   operations when the rounding mode is ROUND_FLOOR.
 
@@ -62,49 +71,211 @@ Library
   ``mmap.PROT_READ|mmap.PROT_EXEC`` would segfault instead of raising a
   TypeError.  Patch by Charles-François Natali.
 
+- Issue #11306: mailbox in certain cases adapts to an inability to open
+  certain files in read-write mode.  Previously it detected this by
+  checking for EACCES, now it also checks for EROFS.
+
 - Issue #11265: asyncore now correctly handles EPIPE, EBADF and EAGAIN errors
   on accept(), send() and recv().
 
-- Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers
-  larger than 4GB.  Patch by Nadeem Vawda.
+- Issue #11326: Add the missing connect_ex() implementation for SSL sockets,
+  and make it work for non-blocking connects.
+
+- Issue #7322: Trying to read from a socket's file-like object after a timeout
+  occurred now raises an error instead of silently losing data.
+
+- Issue #10956: Buffered I/O classes retry reading or writing after a signal
+  has arrived and the handler returned successfully.
+
+- Issue #11224: Fixed a regression in tarfile that affected the file-like
+  objects returned by TarFile.extractfile() regarding performance, memory
+  consumption and failures with the stream interface.
+
+- Issue #11074: Make 'tokenize' so it can be reloaded.
 
 - Issue #4681: Allow mmap() to work on file sizes and offsets larger than
   4GB, even on 32-bit builds.  Initial patch by Ross Lagerwall, adapted for
   32-bit Windows.
 
-- email.header.Header was incorrectly encoding folding white space when
-  rfc2047-encoding header values with embedded newlines, leaving them
-  without folding whitespace.  It now uses the continuation_ws, as it
-  does for continuation lines that it creates itself.
+- Issue #11089: Fix performance issue limiting the use of ConfigParser()
+  with large config files.
 
-- Issue #10360: In WeakSet, do not raise TypeErrors when testing for
-  membership of non-weakrefable objects.
+- Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers
+  larger than 4GB.  Patch by Nadeem Vawda.
 
-- Issue #10549: Fix pydoc traceback when text-documenting certain classes.
+Build
+-----
+
+- Issue #11411: Fix 'make DESTDIR=' with a relative destination.
 
-- Issue #11110: Fix _sqlite to not deref a NULL when module creation fails.
+- Issue #11268: Prevent Mac OS X Installer failure if Documentation
+  package had previously been installed.
 
-- Issue #11089: Fix performance issue limiting the use of ConfigParser()
-  with large config files.
+Tools/Demos
+-----------
+
+- Issue #11179: Make ccbench work under Python 3.1 and 2.7 again.
+
+Tests
+-----
+
+- Issue #11554: Reactivated test_email_codecs.
+
+- Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a
+  false positive if the last directory in the path is inaccessible.
+
+- Issue #11223: Fix test_threadsignals to fail, not hang, when the
+  non-semaphore implementation of locks is used under POSIX.
+
+- Issue #10911: Add tests on CGI with non-ASCII characters. Patch written by
+  Pierre Quentel.
+
+- Issue #9931: Fix hangs in GUI tests under Windows in certain conditions.
+  Patch by Hirokazu Yamamoto.
+
+- Issue #10826: Prevent sporadic failure in test_subprocess on Solaris due
+  to open door files.
+
+
+What's New in Python 3.2?
+=========================
+
+*Release date: 20-Feb-2011*
+
+Core and Builtins
+-----------------
+
+- Issue #11249: Fix potential crashes when using the limited API.
+
+Build
+-----
+
+- Issue #11222: Fix non-framework shared library build on Mac OS X.
+
+- Issue #11184: Fix large-file support on AIX.
+
+- Issue #941346: Fix broken shared library build on AIX.
+
+Documentation
+-------------
+
+- Issue #10709: Add updated AIX notes in Misc/README.AIX.
+
+
+What's New in Python 3.2 Release Candidate 3?
+=============================================
+
+*Release date: 13-Feb-2011*
+
+Core and Builtins
+-----------------
+
+- Issue #11134: Add missing fields to typeslots.h.
+
+- Issue #11135: Remove redundant doc field from PyType_Spec.
+
+- Issue #11067: Add PyType_GetFlags, to support PyUnicode_Check in the limited
+  ABI.
+
+- Issue #11118: Fix bogus export of None in python3.dll.
+
+Library
+-------
+
+- Issue #11116: any error during addition of a message to a mailbox now causes a
+  rollback, instead of leaving the mailbox partially modified.
+
+- Issue #11132: Fix passing of "optimize" parameter when recursing in
+  compileall.compile_dir().
+
+- Issue #11110: Fix a potential decref of a NULL in sqlite3.
+
+- Issue #8275: Fix passing of callback arguments with ctypes under Win64.  Patch
+  by Stan Mihai.
+
+Build
+-----
+
+- Issue #11079: The /Applications/Python x.x folder created by the Mac OS X
+  installers now includes a link to the installed documentation and no longer
+  includes an Extras directory.  The Tools directory is now installed in the
+  framework under share/doc.
+
+- Issue #11121: Fix building with --enable-shared.
+
+Tests
+-----
 
-- Issue #8275: Fix passing of callback arguments with ctypes under Win64.
-  Patch by Stan Mihai.
+- Issue #10971: test_zipimport_support is once again compatible with the refleak
+  hunter feature of test.regrtest.
+
+
+What's New in Python 3.2 Release Candidate 2?
+=============================================
+
+*Release date: 30-Jan-2011*
+
+Core and Builtins
+-----------------
+
+- Issue #10451: memoryview objects could allow to mutate a readable buffer.
+  Initial patch by Ross Lagerwall.
+
+Library
+-------
+
+- Issue #9124: mailbox now accepts binary input and reads and writes mailbox
+  files in binary mode, using the email package's binary support to parse
+  arbitrary email messages.  StringIO and text file input is deprecated,
+  and string input fails early if non-ASCII characters are used, where
+  previously it would fail when the email was processed in a later step.
+
+- Issue #10845: Mitigate the incompatibility between the multiprocessing
+  module on Windows and the use of package, zipfile or directory execution
+  by special casing main modules that actually *are* called __main__.py.
+
+- Issue #11045: Protect logging call against None argument.
+
+- Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save
+  commands.
 
 - Issue #11053: Fix IDLE "Syntax Error" windows to behave as in 2.x,
   preventing a confusing hung appearance on OS X with the windows
   obscured.
 
-- Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save
-  commands.
+- Issue #10940: Workaround an IDLE hang on Mac OS X 10.6 when using the
+  menu accelerators for Open Module, Go to Line, and New Indent Width.
+  The accelerators still work but no longer appear in the menu items.
+
+- Issue #10989: Fix a crash on SSLContext.load_verify_locations(None, True).
 
 - Issue #11020: Command-line pyclbr was broken because of missing 2-to-3
   conversion.
 
+- Issue #11019: Fixed BytesGenerator so that it correctly handles a Message
+  with a None body.
+
+- Issue #11014: Make 'filter' argument in tarfile.Tarfile.add() into a
+  keyword-only argument.  The preceding positional argument was deprecated,
+  so it made no sense to add filter as a positional argument.
+
+- Issue #11004: Repaired edge case in deque.count().
+
 - Issue #10974: IDLE no longer crashes if its recent files list includes files
   with non-ASCII characters in their path names.
 
+- Have hashlib.algorithms_available and hashlib.algorithms_guaranteed both
+  return sets instead of one returning a tuple and the other a frozenset.
+
 - Issue #10987: Fix the recursion limit handling in the _pickle module.
 
+- Issue #10983: Fix several bugs making tunnel requests in http.client.
+
+- Issue #10955: zipimport uses ASCII encoding instead of cp437 to decode
+  filenames, at bootstrap, if the codec registry is not ready yet. It is still
+  possible to have non-ASCII filenames using the Unicode flag (UTF-8 encoding)
+  for all file entries in the ZIP file.
+
 - Issue #10949: Improved robustness of rotating file handlers.
 
 - Issue #10955: Fix a potential crash when trying to mmap() a file past its
@@ -113,24 +284,130 @@ Library
 - Issue #10898: Allow compiling the posix module when the C library defines
   a symbol named FSTAT.
 
-- Issue #10916: mmap should not segfault when a file is mapped using 0 as
-  length and a non-zero offset, and an attempt to read past the end of file
-  is made (IndexError is raised instead).  Patch by Ross Lagerwall.
+- Issue #10980: the HTTP server now encodes headers with iso-8859-1 (latin1)
+  encoding.  This is the preferred encoding of PEP 3333 and the base encoding
+  of HTTP 1.1.
+
+- To match the behaviour of HTTP server, the HTTP client library now also
+  encodes headers with iso-8859-1 (latin1) encoding.  It was already doing
+  that for incoming headers which makes this behaviour now consistent in
+  both incoming and outgoing direction.
+
+- Issue #9509: argparse now properly handles IOErrors raised by
+  argparse.FileType.
+
+- Issue #10961: The new pydoc server now better handles exceptions raised
+  during request handling.
+
+- Issue #10680: Fix mutually exclusive arguments for argument groups in
+  argparse.
+
+Build
+-----
+
+- Issue #11054: Allow Mac OS X installer builds to again work on 10.5 with
+  the system-provided Python.
+
+
+What's New in Python 3.2 Release Candidate 1
+============================================
+
+*Release date: 16-Jan-2011*
+
+Core and Builtins
+-----------------
+
+- Issue #10889: range indexing and slicing now works correctly on ranges with
+  a length that exceeds sys.maxsize.
+
+- Issue #10892: Don't segfault when trying to delete __abstractmethods__ from a
+  class.
+
+- Issue #8020: Avoid a crash where the small objects allocator would read
+  non-Python managed memory while it is being modified by another thread.  Patch
+  by Matt Bandy.
+
+- Issue #10841: On Windows, set the binary mode on stdin, stdout, stderr and all
+  io.FileIO objects (to not translate newlines, \r\n <=> \n).  The Python parser
+  translates newlines (\r\n => \n).
 
-- Issue #10899: No function type annotations in the standard library.
-  Removed function type annotations from _pyio.py.
+- Remove buffer API from stable ABI for now, see #10181.
+
+- Issue #8651: PyArg_Parse*() functions raise an OverflowError if the file
+  doesn't have PY_SSIZE_T_CLEAN define and the size doesn't fit in an int
+  (length bigger than 2^31-1 bytes).
+
+- Issue #9015, #9611: FileIO.readinto(), FileIO.write(), os.write() and
+  stdprinter.write() clamp the length to 2^31-1 on Windows.
+
+- Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime()
+  can now handle dates after 2038.
+
+- Issue #10780: PyErr_SetFromWindowsErrWithFilename() and
+  PyErr_SetExcFromWindowsErrWithFilename() decode the filename from the
+  filesystem encoding instead of UTF-8.
+
+- Issue #10779: PyErr_WarnExplicit() decodes the filename from the filesystem
+  encoding instead of UTF-8.
+
+- Add sys.flags attribute for the new -q command-line option.
+
+Library
+-------
+
+- Issue #10916: mmap should not segfault when a file is mapped using 0 as length
+  and a non-zero offset, and an attempt to read past the end of file is made
+  (IndexError is raised instead).  Patch by Ross Lagerwall.
+
+- Issue #10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5, rather
+  than the currently problematic Apple-supplied one, when running with the
+  64-/32-bit installer variant.
+
+- Issue #4953: cgi.FieldStorage and cgi.parse() parse the request as bytes, not
+  as unicode, and accept binary files. Add encoding and errors attributes to
+  cgi.FieldStorage. Patch written by Pierre Quentel (with many inputs by Glenn
+  Linderman).
+
+- Add encoding and errors arguments to urllib.parse_qs() and urllib.parse_qsl().
+
+- Issue #10899: No function type annotations in the standard library.  Removed
+  function type annotations from _pyio.py.
 
 - Issue #10875: Update Regular Expression HOWTO; patch by 'SilentGhost'.
 
-- Issue #10869: Fixed bug where ast.increment_lineno modified the root
-  node twice.
+- Issue #10872: The repr() of TextIOWrapper objects now includes the mode
+  if available.
+
+- Issue #10869: Fixed bug where ast.increment_lineno modified the root node
+  twice.
 
 - Issue #5871: email.header.Header.encode now raises an error if any
-  continuation line in the formatted value has no leading white space
-  and looks like a header.  Since Generator uses Header to format all
-  headers, this check is made for all headers in any serialized message
-  at serialization time.  This provides protection against header
-  injection attacks.
+  continuation line in the formatted value has no leading white space and looks
+  like a header.  Since Generator uses Header to format all headers, this check
+  is made for all headers in any serialized message at serialization time.  This
+  provides protection against header injection attacks.
+
+- Issue #10859: Make ``contextlib.GeneratorContextManager`` officially
+  private by renaming it to ``_GeneratorContextManager``.
+
+- Issue #10042: Fixed the total_ordering decorator to handle cross-type
+  comparisons that could lead to infinite recursion.
+
+- Issue #10686: the email package now :rfc:`2047`\ -encodes headers with
+  non-ASCII bytes (parsed by a Bytes Parser) when doing conversion to 7bit-clean
+  presentation, instead of replacing them with ?s.
+
+- email.header.Header was incorrectly encoding folding white space when
+  rfc2047-encoding header values with embedded newlines, leaving them without
+  folding whitespace.  It now uses the continuation_ws, as it does for
+  continuation lines that it creates itself.
+
+- Issue #1777412, #10827: Changed the rules for 2-digit years. The
+  time.asctime(), time.ctime() and time.strftime() functions will now format
+  any year when ``time.accept2dyear`` is False and will accept years >= 1000
+  otherwise. ``time.mktime`` and ``time.strftime`` now accept full range
+  supported by the OS. With Visual Studio or on Solaris, the year is limited to
+  the range [1; 9999]. Conversion of 2-digit years to 4-digit is deprecated.
 
 - Issue #7858: Raise an error properly when os.utime() fails under Windows
   on an existing file.
@@ -138,43 +415,222 @@ Library
 - Issue #3839: wsgiref should not override a Content-Length header set by
   the application.  Initial patch by Clovis Fabricio.
 
+- Issue #10492: bdb.Bdb.run() only traces the execution of the code, not the
+  compilation (if the input is a string).
+
+- Issue #7995: When calling accept() on a socket with a timeout, the returned
+  socket is now always blocking, regardless of the operating system.
+
+- Issue #10756: atexit normalizes the exception before displaying it. Patch by
+  Andreas Stührk.
+
 - Issue #10790: email.header.Header.append's charset logic now works correctly
   for charsets whose output codec is different from its input codec.
 
-- Issue #6643: Reinitialize locks held within the threading module after fork
-  to avoid a potential rare deadlock or crash on some platforms.
+- Issue #10819: SocketIO.name property returns -1 when its closed, instead of
+  raising a ValueError, to fix repr().
+
+- Issue #8650: zlib.compress() and zlib.decompress() raise an OverflowError if
+  the input buffer length doesn't fit into an unsigned int (length bigger than
+  2^32-1 bytes).
+
+- Issue #6643: Reinitialize locks held within the threading module after fork to
+  avoid a potential rare deadlock or crash on some platforms.
+
+- Issue #10806, issue #9905: Fix subprocess pipes when some of the standard file
+  descriptors (0, 1, 2) are closed in the parent process.  Initial patch by Ross
+  Lagerwall.
+
+- `unittest.TestCase` can be instantiated without a method name; for simpler
+  exploration from the interactive interpreter.
+
+- Issue #10798: Reject supporting concurrent.futures if the system has too
+  few POSIX semaphores.
 
-- Issue #10806, issue #9905: Fix subprocess pipes when some of the standard
-  file descriptors (0, 1, 2) are closed in the parent process.  Initial
-  patch by Ross Lagerwall.
+- Issue #10807: Remove base64, bz2, hex, quopri, rot13, uu and zlib codecs from
+  the codec aliases. They are still accessible via codecs.lookup().
 
-- Issue 10753 - Characters ';','=' and ',' in the PATH_INFO environment
-  variable won't be quoted when the URI is constructed by the wsgiref.util 's
-  request_uri method. According to RFC 3986, these characters can be a part of
-  params in PATH component of URI and need not be quoted.
+- Issue #10801: In zipfile, support different encodings for the header and the
+  filenames.
 
-- Issue 10738: Fix webbrowser.Opera.raise_opts
+- Issue #6285: IDLE no longer crashes on missing help file; patch by Scott
+  David Daniels.
 
-- Issue 9824: SimpleCookie now encodes , and ; in values to cater to how
+- Fix collections.OrderedDict.setdefault() so that it works in subclasses that
+  define __missing__().
+
+- Issue #10786: unittest.TextTestRunner default stream no longer bound at import
+  time. `sys.stderr` now looked up at instantiation time.  Fix contributed by
+  Mark Roddy.
+
+- Issue #10753: Characters ';','=' and ',' in the PATH_INFO environment variable
+  won't be quoted when the URI is constructed by the wsgiref.util 's request_uri
+  method. According to RFC 3986, these characters can be a part of params in
+  PATH component of URI and need not be quoted.
+
+- Issue #10738: Fix webbrowser.Opera.raise_opts.
+
+- Issue #9824: SimpleCookie now encodes , and ; in values to cater to how
   browsers actually parse cookies.
 
+- Issue #9333: os.symlink now available regardless of user privileges.  The
+  function now raises OSError on Windows >=6.0 when the user is unable to create
+  symbolic links. XP and 2003 still raise NotImplementedError.
+
+- Issue #10783: struct.pack() no longer implicitly encodes unicode to UTF-8.
+
+- Issue #10730: Add SVG mime types to mimetypes module.
+
+- Issue #10768: Make the Tkinter ScrolledText widget work again.
+
+- Issue #10777: Fix "dictionary changed size during iteration" bug in
+  ElementTree register_namespace().
+
+- Issue #10626: test_logging now preserves logger disabled states.
+
+- Issue #10774: test_logging now removes temp files created during tests.
+
 - Issue #5258/#10642: if site.py encounters a .pth file that generates an error,
   it now prints the filename, line number, and traceback to stderr and skips
   the rest of that individual file, instead of stopping processing entirely.
 
+- Issue #10763: subprocess.communicate() closes stdout and stderr if both are
+  pipes (bug specific to Windows).
+
+- Issue #1693546: fix email.message RFC 2231 parameter encoding to be in better
+  compliance (no "s around encoded values).
+
+- Improved the diff message in the unittest module's assertCountEqual().
+
+- Issue #1155362: email.utils.parsedate_tz now handles a missing space before
+  the '-' of a timezone field as well as before a '+'.
+
 - Issue #4871: The zipfile module now gives a more useful error message if
   an attempt is made to use a string to specify the archive password.
 
 - Issue #10750: The ``raw`` attribute of buffered IO objects is now read-only.
 
+- Deprecated assertDictContainsSubset() in the unittest module.
+
+C-API
+-----
+
+- Issue #10913: Deprecate misleading functions PyEval_AcquireLock() and
+  PyEval_ReleaseLock().  The thread-state aware APIs should be used instead.
+
+- Issue #10333: Remove ancient GC API, which has been deprecated since Python
+  2.2.
+
+Build
+-----
+
+- Issue #10843: Update third-party library versions used in OS X 32-bit
+  installer builds: bzip2 1.0.6, readline 6.1.2, SQLite 3.7.4 (with FTS3/FTS4
+  and RTREE enabled), and ncursesw 5.5 (wide-char support enabled).
+
+- Issue #10820: Fix OS X framework installs to support version-specific
+  scripts (#10679).
+
+- Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in
+  the configure script but use $GREP instead.  Patch by Fabian Groffen.
+
+- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD
+  and DragonFly BSD.  Patch by Nicolas Joly.
+
+- Issue #10679: The "idle", "pydoc" and "2to3" scripts are now installed with
+  a version-specific suffix on "make altinstall".
+
+- Issue #10655: Fix the build on PowerPC on Linux with GCC when building with
+  timestamp profiling (--with-tsc): the preprocessor test for the PowerPC
+  support now looks for "__powerpc__" as well as "__ppc__": the latter seems to
+  only be present on OS X; the former is the correct one for Linux with GCC.
+
+- Issue #1099: Fix the build on MacOSX when building a framework with pydebug
+  using GCC 4.0.
+
+Tools/Demos
+-----------
+
+- Issue #10843: Install the Tools directory on OS X in the applications Extras
+  (/Applications/Python 3.n/Extras/) where the Demo directory had previous been
+  installed.
+
+- Issue #7962: The Demo directory is gone.  Most of the old and unmaintained
+  demos have been removed, others integrated in documentation or a new
+  Tools/demo subdirectory.
+
+- Issue #10502: Addition of the unittestgui tool. Originally by Steve Purcell.
+  Updated for test discovery by Mark Roddy and Python 3 compatibility by Brian
+  Curtin.
+
+Tests
+-----
+
+- Issue #10822: Fix test_posix:test_getgroups failure under Solaris.  Patch
+  by Ross Lagerwall.
+
+- Make the --coverage flag work for test.regrtest.
+
+- Issue #1677694: Refactor and improve test_timeout.  Original patch by
+  Björn Lindqvist.
+
+- Issue #5485: Add tests for the UseForeignDTD method of expat parser objects.
+  Patch by Jean-Paul Calderone and Sandro Tosi.
+
+- Issue #6293: Have regrtest.py echo back sys.flags.  This is done by default in
+  whole runs and enabled selectively using ``--header`` when running an explicit
+  list of tests.  Original patch by Collin Winter.
+
+
+What's New in Python 3.2 Beta 2?
+================================
+
+*Release date: 19-Dec-2010*
+
+Core and Builtins
+-----------------
+
+- Issue #8844: Regular and recursive lock acquisitions can now be interrupted
+  by signals on platforms using pthreads.  Patch by Reid Kleckner.
+
+- Issue #4236: PyModule_Create2 now checks the import machinery directly
+  rather than the Py_IsInitialized flag, avoiding a Fatal Python
+  error in certain circumstances when an import is done in __del__.
+
+- Issue #5587: add a repr to dict_proxy objects.  Patch by David Stanek and
+  Daniel Urban.
+
+Library
+-------
+
+- Issue #3243:  Support iterable bodies in httplib. Patch Contributions by
+  Xuanji Li and Chris AtLee.
+
+- Issue #10611: SystemExit exception will no longer kill a unittest run.
+
+- Issue #9857: It is now possible to skip a test in a setUp, tearDown or clean
+  up function.
+
+- Issue #10573: use actual/expected consistently in unittest methods.
+  The order of the args of assertCountEqual is also changed.
+
+- Issue #9286: email.utils.parseaddr no longer concatenates blank-separated
+  words in the local part of email addresses, thereby preserving the input.
+
 - Issue #6791: Limit header line length (to 65535 bytes) in http.client
   and http.server, to avoid denial of services from the other party.
 
 - Issue #10404: Use ctl-button-1 on OSX for the context menu in Idle.
 
+- Issue #9907: Fix tab handling on OSX when using editline by calling
+  rl_initialize first, then setting our custom defaults, then reading .editrc.
+
 - Issue #4188: Avoid creating dummy thread objects when logging operations
   from the threading module (with the internal verbose flag activated).
 
+- Issue #10711: Remove HTTP 0.9 support from http.client.  The ``strict``
+  parameter to HTTPConnection and friends is deprecated.
+
 - Issue #9721: Fix the behavior of urljoin when the relative url starts with a
   ';' character. Patch by Wes Chow.
 
@@ -183,118 +639,240 @@ Library
 
 - Issue #9558: Fix distutils.command.build_ext with VS 8.0.
 
+- Issue #10667: Fast path for collections.Counter().
+
 - Issue #10695: passing the port as a string value to telnetlib no longer
   causes debug mode to fail.
 
 - Issue #1078919: add_header now automatically RFC2231 encodes parameters
   that contain non-ascii values.
 
-- Issue #10107: Warn about unsaved files in IDLE on OSX.
+- Issue #10188 (partial resolution): tempfile.TemporaryDirectory emits
+  a warning on sys.stderr rather than throwing a misleading exception
+  if cleanup fails due to nulling out of modules during shutdown.
+  Also avoids an AttributeError when mkdtemp call fails and issues
+  a ResourceWarning on implicit cleanup via __del__.
 
-- Issue #7904: Changes to urllib.parse.urlsplit to handle schemes as defined by
-  RFC3986. Anything before :// is considered a scheme and is followed by an
-  authority (or netloc) and by '/' led path, which is optional.
+- Issue #10107: Warn about unsaved files in IDLE on OSX.
 
-- Issue #10478: Reentrant calls inside buffered IO objects (for example by
-  way of a signal handler) now raise a RuntimeError instead of freezing the
-  current process.
+- Issue #7213: subprocess.Popen's default for close_fds has been changed.
+  It is now True in most cases other than on Windows when input, output or
+  error handles are provided.
 
-- Issue #10464: netrc now correctly handles lines with embedded '#' characters.
+- Issue #6559: subprocess.Popen has a new pass_fds parameter (actually
+  added in 3.2beta1) to allow specifying a specific list of file descriptors
+  to keep open in the child process.
 
 - Issue #1731717: Fixed the problem where subprocess.wait() could cause an
   OSError exception when The OS had been told to ignore SIGCLD in our process
   or otherwise not wait for exiting child processes.
 
-- Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified 
-  IP addresses in the proxy exception list. 
+Tests
+-----
 
-Extensions
-----------
+- Issue #775964: test_grp now skips YP/NIS entries instead of failing when
+  encountering them.
 
-- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY.
+Tools/Demos
+-----------
+
+- Issue #6075: IDLE on Mac OS X now works with both Carbon AquaTk and
+  Cocoa AquaTk.
+
+- Issue #10710: ``Misc/setuid-prog.c`` is removed from the source tree.
+
+- Issue #10706: Remove outdated script runtests.sh.  Either ``make test``
+  or ``python -m test`` should be used instead.
 
 Build
 -----
 
-- Issue #11411: Fix 'make DESTDIR=' with a relative destination.
+- The Windows build now uses Tcl/Tk 8.5.9 and sqlite3 3.7.4.
 
-- Issue #11184: Fix large-file support on AIX.
+- Issue #9234: argparse supports alias names for subparsers.
 
-- Issue #941346: Fix broken shared library build on AIX.
 
-- Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in
-  the configure script but use $GREP instead.  Patch by Fabian Groffen.
+What's New in Python 3.2 Beta 1?
+================================
 
-- Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD
-  and DragonFly BSD.  Patch by Nicolas Joly.
+*Release date: 05-Dec-2010*
 
-- Issue #10655: Fix the build on PowerPC on Linux with GCC when building with
-  timestamp profiling (--with-tsc): the preprocessor test for the PowerPC
-  support now looks for "__powerpc__" as well as "__ppc__": the latter seems to
-  only be present on OS X; the former is the correct one for Linux with GCC.
+Core and Builtins
+-----------------
 
-- Issue #1099: Fix the build on MacOSX when building a framework with pydebug
-  using GCC 4.0.
+- Issue #10630: Return dict views from the dict proxy keys()/values()/items()
+  methods.
 
-Tests
------
+- Issue #10596: Fix float.__mod__ to have the same behaviour as float.__divmod__
+  with respect to signed zeros.  -4.0 % 4.0 should be 0.0, not -0.0.
 
-- Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a
-  false positive if the last directory in the path is inaccessible.
+- Issue #1772833: Add the -q command-line option to suppress copyright and
+  version output in interactive mode.
 
-- Issue #10822: Fix test_posix:test_getgroups failure under Solaris.  Patch
-  by Ross Lagerwall.
+- Provide an *optimize* parameter in the built-in compile() function.
 
-- Issue #6293: Have regrtest.py echo back sys.flags.  This is done by default
-  in whole runs and enabled selectively using ``--header`` when running an
-  explicit list of tests.  Original patch by Collin Winter.
+- Fixed several corner case issues on Windows in os.stat/os.lstat related to
+  reparse points.
 
-- Issue #775964: test_grp now skips YP/NIS entries instead of failing when
-  encountering them.
+- PEP 384 (Defining a Stable ABI) is implemented.
 
-- Issue #7110: regrtest now sends test failure reports and single-failure
-  tracebacks to stderr rather than stdout.
+- Issue #2690: Range objects support negative indices and slicing.
 
+- Issue #9915: Speed up sorting with a key.
 
-What's New in Python 3.1.3?
-===========================
+- Issue #8685: Speed up set difference ``a - b`` when source set ``a`` is much
+  larger than operand ``b``.  Patch by Andrew Bennetts.
 
-*Release date: 2010-11-27*
+- Issue #10518: Bring back the callable() builtin.
 
-Core and Builtins
------------------
+- Issue #7094: Added alternate formatting (specified by '#') to ``__format__``
+  method of float, complex, and Decimal. This allows more precise control over
+  when decimal points are displayed.
 
-- Issue #10391: Don't dereference invalid memory in error messages in the ast
-  module.
+- Issue #10474: range.count() should return integers.
+
+- Issue #1574217: isinstance now catches only AttributeError, rather than
+  masking all errors.
 
 Library
 -------
 
-- Issue #2236: distutils' mkpath ignored the mode parameter.
+- logging: added "handler of last resort". See http://bit.ly/last-resort-handler
 
-- Fix typo in one sdist option (medata-check).
+- test.support: Added TestHandler and Matcher classes for better support of
+  assertions about logging.
 
-- Issue #10323: itertools.islice() now consumes the minimum number of
-  inputs before stopping.  Formerly, the final state of the underlying
-  iterator was undefined.
+- Issue #4391: Use proper plural forms in argparse.
 
-- Issue #10565: The collections.Iterator ABC now checks for both
-  __iter__ and __next__.
+- Issue #10601: sys.displayhook uses 'backslashreplace' error handler on
+  UnicodeEncodeError.
 
-- Issue #10561: In pdb, clear the breakpoints by the breakpoint number.
+- Add the "display" and "undisplay" pdb commands.
 
-- Issue #10459: Update CJK character names to Unicode 5.1.
+- Issue #7245: Add a SIGINT handler in pdb that allows to break a program again
+  after a "continue" command.
 
-- Issue #10092: Properly reset locale in calendar.Locale*Calendar classes.
+- Add the "interact" pdb command.
 
-- Issue #6098: Don't claim DOM level 3 conformance in minidom.
+- Issue #7905: Actually respect the keyencoding parameter to shelve.Shelf.
 
-- Issue #5762: Fix AttributeError raised by ``xml.dom.minidom`` when an empty
-  XML namespace attribute is encountered.
+- Issue #1569291: Speed up array.repeat().
 
-- Issue #1710703: Write structures for an empty ZIP archive when a ZipFile is
-  created in modes 'a' or 'w' and then closed without adding any files. Raise
-  BadZipfile (rather than IOError) when opening small non-ZIP files.
+- Provide an interface to set the optimization level of compilation in
+  py_compile, compileall and zipfile.PyZipFile.
+
+- Issue #7904: Changes to urllib.parse.urlsplit to handle schemes as defined by
+  RFC3986. Anything before :// is considered a scheme and is followed by an
+  authority (or netloc) and by '/' led path, which is optional.
+
+- Issue #6045: dbm.gnu databases now support get() and setdefault() methods.
+
+- Issue #10620: `python -m unittest` can accept file paths instead of module
+  names for running specific tests.
+
+- Issue #9424: Deprecate the `unittest.TestCase` methods `assertEquals`,
+  `assertNotEquals`, `assertAlmostEquals`, `assertNotAlmostEquals` and `assert_`
+  and replace them with the correct methods in the Python test suite.
+
+- Issue #10272: The ssl module now raises socket.timeout instead of a generic
+  SSLError on socket timeouts.
+
+- Issue #10528: Allow translators to reorder placeholders in localizable
+  messages from argparse.
+
+- Issue #10497: Fix incorrect use of gettext in argparse.
+
+- Issue #10478: Reentrant calls inside buffered IO objects (for example by
+  way of a signal handler) now raise a RuntimeError instead of freezing the
+  current process.
+
+- logging: Added getLogRecordFactory/setLogRecordFactory with docs and tests.
+
+- Issue #10549: Fix pydoc traceback when text-documenting certain classes.
+
+- Issue #2001: New HTML server with enhanced Web page features.  Patch by Ron
+  Adam.
+
+- Issue #10360: In WeakSet, do not raise TypeErrors when testing for membership
+  of non-weakrefable objects.
+
+- Issue #940286: pydoc.Helper.help() ignores input/output init parameters.
+
+- Issue #1745035: Add a command size and data size limit to smtpd.py, to prevent
+  DoS attacks.  Patch by Savio Sena.
+
+- Issue #4925: Add filename to error message when executable can't be found in
+  subprocess.
+
+- Issue #10391: Don't dereference invalid memory in error messages in the ast
+  module.
+
+- Issue #10027: st_nlink was not being set on Windows calls to os.stat or
+  os.lstat. Patch by Hirokazu Yamamoto.
+
+- Issue #9333: Expose os.symlink only when the SeCreateSymbolicLinkPrivilege is
+  held by the user's account, i.e., when the function can actually be used.
+
+- Issue #8879: Add os.link support for Windows.
+
+- Issue #7911: ``unittest.TestCase.longMessage`` defaults to True for improved
+  failure messages by default. Patch by Mark Roddy.
+
+- Issue #1486713: HTMLParser now has an optional tolerant mode where it tries to
+  guess at the correct parsing of invalid html.
+
+- Issue #10554: Add context manager support to subprocess.Popen objects.
+
+- Issue #8989: email.utils.make_msgid now has a domain parameter that can
+  override the domain name used in the generated msgid.
+
+- Issue #9299: Add exist_ok parameter to os.makedirs to suppress the 'File
+  exists' exception when a target directory already exists with the specified
+  mode. Patch by Ray Allen.
+
+- Issue #9573: os.fork() now works correctly when triggered as a side effect of
+  a module import.
+
+- Issue #10464: netrc now correctly handles lines with embedded '#' characters.
+
+- Added itertools.accumulate().
+
+- Issue #4113: Added custom ``__repr__`` method to ``functools.partial``.
+  Original patch by Daniel Urban.
+
+- Issue #10273: Rename `assertRegexpMatches` and `assertRaisesRegexp` to
+  `assertRegex` and `assertRaisesRegex`.
+
+- Issue #10535: Enable silenced warnings in unittest by default.
+
+- Issue #9873: The URL parsing functions in urllib.parse now accept ASCII byte
+  sequences as input in addition to character strings.
+
+- Issue #10586: The statistics API for the new functools.lru_cache has been
+  changed to a single cache_info() method returning a named tuple.
+
+- Issue #10323: itertools.islice() now consumes the minimum number of inputs
+  before stopping.  Formerly, the final state of the underlying iterator was
+  undefined.
+
+- Issue #10565: The collections.Iterator ABC now checks for both __iter__ and
+  __next__.
+
+- Issue #10242: Fixed implementation of unittest.ItemsEqual and gave it a new
+  more informative name, unittest.CountEqual.
+
+- Issue #10561: In pdb, clear the breakpoints by the breakpoint number.
+
+- Issue #2986: difflib.SequenceMatcher gets a new parameter, autojunk, which can
+  be set to False to turn off the previously undocumented 'popularity'
+  heuristic. Patch by Terry Reedy and Eli Bendersky.
+
+- Issue #10534: in difflib, expose bjunk and bpopular sets; deprecate
+  undocumented and now redundant isbjunk and isbpopular methods.
+
+- Issue #9846: zipfile is now correctly closing underlying file objects.
+
+- Issue #10459: Update CJK character names to Unicode 6.0.
 
 - Issue #4493: urllib.request adds '/' in front of path components which does not
   start with '/. Common behavior exhibited by browsers and other clients.
@@ -302,33 +880,122 @@ Library
 - Issue #6378: idle.bat now runs with the appropriate Python version rather than
   the system default. Patch by Sridhar Ratnakumar.
 
+- Issue #10470: 'python -m unittest' will now run test discovery by default,
+  when no extra arguments have been provided.
+
+- Issue #3709: BaseHTTPRequestHandler will buffer the headers and write to
+  output stream only when end_headers is invoked. This is a speedup and an
+  internal optimization.  Patch by endian.
+
+- Issue #10220: Added inspect.getgeneratorstate. Initial patch by Rodolpho
+  Eckhardt.
+
+- Issue #10453: compileall now uses argparse instead of getopt, and thus
+  provides clean output when called with '-h'.
+
+- Issue #8078: Add constants for higher baud rates in the termios module.  Patch
+  by Rodolpho Eckhardt.
+
 - Issue #10407: Fix two NameErrors in distutils.
 
-- Issue #10198: fix duplicate header written to wave files when writeframes()
-  is called without data.
+- Issue #10371: Deprecated undocumented functions in the trace module.
 
 - Issue #10467: Fix BytesIO.readinto() after seeking into a position after the
   end of the file.
 
+- configparser: 100% test coverage.
+
+- Issue #10499: configparser supports pluggable interpolation handlers. The
+  default classic interpolation handler is called BasicInterpolation. Another
+  interpolation handler added (ExtendedInterpolation) which supports the syntax
+  used by zc.buildout (e.g. interpolation between sections).
+
+- configparser: the SafeConfigParser class has been renamed to ConfigParser.
+  The legacy ConfigParser class has been removed but its interpolation mechanism
+  is still available as LegacyInterpolation.
+
+- configparser: Usage of RawConfigParser is now discouraged for new projects
+  in favor of ConfigParser(interpolation=None).
+
 - Issue #1682942: configparser supports alternative option/value delimiters.
 
-Build
+- Issue #5412: configparser supports mapping protocol access.
+
+- Issue #9411: configparser supports specifying encoding for read operations.
+
+- Issue #9421: configparser's getint(), getfloat() and getboolean() methods
+  accept vars and default arguments just like get() does.
+
+- Issue #9452: configparser supports reading from strings and dictionaries
+  (thanks to the mapping protocol API, the latter can be used to copy data
+  between parsers).
+
+- configparser: accepted INI file structure is now customizable, including
+  comment prefixes, name of the DEFAULT section, empty lines in multiline
+  values, and indentation.
+
+- Issue 10326: unittest.TestCase instances can be pickled.
+
+- Issue 9926: Wrapped TestSuite subclass does not get __call__ executed.
+
+- Issue #9920: Skip tests for cmath.atan and cmath.atanh applied to complex
+  zeros on systems where the log1p function fails to respect the sign of zero.
+  This fixes a test failure on AIX.
+
+- Issue #9732: Addition of getattr_static to the inspect module.
+
+- Issue #10446: Module documentation generated by pydoc now links to a
+  version-specific online reference manual.
+
+- Make the 'No module named' exception message from importlib consistent.
+
+- Issue #10443: Add the SSLContext.set_default_verify_paths() method.
+
+- Issue #10440: Support RUSAGE_THREAD as a constant in the resource module.
+  Patch by Robert Collins.
+
+- Issue #10429: IMAP.starttls() stored the capabilities as bytes objects, rather
+  than strings.
+
+C-API
 -----
 
-- Don't run pgen twice when using make -j.
+- Issue #10557: Added a new API function, PyUnicode_TransformDecimalToASCII(),
+  which transforms non-ASCII decimal digits in a Unicode string to their ASCII
+  equivalents.
 
-- Backport r83399 to allow test_distutils to pass on installed versions.
+- Issue #9518: Extend the PyModuleDef_HEAD_INIT macro to explicitly
+  zero-initialize all fields, fixing compiler warnings seen when building
+  extension modules with gcc with "-Wmissing-field-initializers" (implied by
+  "-W").
 
-- Issue #1303434: Generate ZIP file containing all PDBs (already done for rc1).
+- Issue #10255: Fix reference leak in Py_InitializeEx().  Patch by Neil
+  Schemenauer.
 
-- Stop packaging versioncheck tool (already done for rc1).
+- structseq.h is now included in Python.h.
 
-- Accept Oracle Berkeley DB 4.8, 5.0 and 5.1 as backend for the dbm extension.
+- Loosen PyArg_ValidateKeywordArguments to allow dict subclasses.
 
 Tests
 -----
 
-- Issue #9424: Replace deprecated assert* methods in the Python test suite.
+- regrtest.py once again ensures the test directory is removed from sys.path
+  when it is invoked directly as the __main__ module.
+
+- `python -m test` can be used to run the test suite as well as `python -m
+  test.regrtest`.
+
+- Do not fail test_socket when the IP address of the local hostname cannot be
+  looked up.
+
+- Issue #8886: Use context managers throughout test_zipfile. Patch by Eric
+  Carstensen.
+
+Build
+-----
+
+- Issue #10325: Fix two issues in the fallback definitions for PY_ULLONG_MAX and
+  PY_LLONG_MAX that made them unsuitable for use in preprocessor conditionals.
 
 Documentation
 -------------
@@ -336,874 +1003,1448 @@ Documentation
 - Issue #10299: List the built-in functions in a table in functions.rst.
 
 
-What's New in Python 3.1.3 release candidate 1?
-===============================================
+What's New in Python 3.2 Alpha 4?
+=================================
 
-*Release date: 2010-11-13*
+*Release date: 13-Nov-2010*
 
 Core and Builtins
 -----------------
 
+- Issue #10372: Import the warnings module only after the IO library is
+  initialized, so as to avoid bootstrap issues with the '-W' option.
+
+- Issue #10293: Remove obsolete field in the PyMemoryView structure, unused
+  undocumented value PyBUF_SHADOW, and strangely-looking code in
+  PyMemoryView_GetContiguous.
+
+- Issue #6081: Add str.format_map(), similar to ``str.format(**mapping)``.
+
+- If FileIO.__init__ fails, close the file descriptor.
+
 - Issue #10221: dict.pop(k) now has a key error message that includes the
   missing key (same message d[k] returns for missing keys).
 
-- Issue #5437: A preallocated MemoryError instance should not hold traceback
+- Issue #5437: A preallocated MemoryError instance should not keep traceback
   data (including local variables caught in the stack trace) alive infinitely.
 
-- Issue #10077: Fix logging of site module errors at startup.
-
 - Issue #10186: Fix the SyntaxError caret when the offset is equal to the length
   of the offending line.
 
-- Issue #9713, #10114: Parser functions (eg. PyParser_ASTFromFile) expects
-  filenames encoded to the filesystem encoding with surrogateescape error
-  handler (to support undecodable bytes), instead of UTF-8 in strict mode.
+- Issue #10089: Add support for arbitrary -X options on the command line.  They
+  can be retrieved through a new attribute ``sys._xoptions``.
 
-- Issue #10006: type.__abstractmethods__ now raises an AttributeError.  As a
-  result metaclasses can now be ABCs (see #9533).
+- Issue #4388: On Mac OS X, decode command line arguments from UTF-8, instead of
+  the locale encoding.  If the LANG (and LC_ALL and LC_CTYPE) environment
+  variable is not set, the locale encoding is ISO-8859-1, whereas most programs
+  (including Python) expect UTF-8.  Python already uses UTF-8 for the filesystem
+  encoding and to encode command line arguments on this OS.
+
+- Issue #9713, #10114: Parser functions (e.g. PyParser_ASTFromFile) expect
+  filenames encoded to the filesystem encoding with the surrogateescape error
+  handler (to support undecodable bytes), instead of UTF-8 in strict mode.
 
 - Issue #9997: Don't let the name "top" have special significance in scope
   resolution.
 
-- Issue #9930: Remove bogus subtype check that was causing (e.g.)
-  float.__rdiv__(2.0, 3) to return NotImplemented instead of the
-  expected 1.5.
+- Issue #9862: Compensate for broken PIPE_BUF in AIX by hard coding its value as
+  the default 512 when compiling on AIX.
 
-- Issue #9804: ascii() now always represents unicode surrogate pairs as
-  a single ``\UXXXXXXXX``, regardless of whether the character is printable
-  or not.  Also, the "backslashreplace" error handler now joins surrogate
-  pairs into a single character on UCS-2 builds.
+- Use locale encoding instead of UTF-8 to encode and decode filenames if
+  Py_FileSystemDefaultEncoding is not set.
 
-- Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid
-  thread-local storage key.
+- Issue #10095: fp_setreadl() doesn't reopen the file, instead reuse the file
+  descriptor.
 
-- Issue #9737: Fix a crash when trying to delete a slice or an item from
-  a memoryview object.
+- Issue #9418: Moved private string methods ``_formatter_parser`` and
+  ``_formatter_field_name_split`` into a new ``_string`` module.
 
-- Issue #7415: PyUnicode_FromEncodedObject() now uses the new buffer API
-  properly.  Patch by Stefan Behnel.
+- Issue #9992: Remove PYTHONFSENCODING environment variable.
 
-- Restore GIL in nis_cat in case of error.
+Library
+-------
 
-- Issue #9712: Fix tokenize on identifiers that start with non-ascii names.
+- Issue #10465: fix broken delegating of attributes by gzip._PaddedFile.
 
-- Issue #9688: __basicsize__ and __itemsize__ must be accessed as Py_ssize_t.
+- Issue #10356: Decimal.__hash__(-1) should return -2.
 
-- Issue #5319: Print an error if flushing stdout fails at interpreter
-  shutdown.
+- Issue #1553375: logging: Added stack_info kwarg to display stack information.
 
-- Issue #8814: function annotations (the ``__annotations__`` attribute)
-  are now included in the set of attributes copied by default by
-  functools.wraps and functools.update_wrapper.  Patch by Terrence Cole.
+- Issue #5111: IPv6 Host in the Header is wrapped inside [ ]. Patch by Chandru.
 
-- Issue #83755:  Implicit set-to-frozenset conversion was not thread-safe.
+- Fix Fraction.__hash__ so that Fraction.__hash__(-1) is -2.  (See also issue
+  #10356.)
 
-- Issue #10068: Global objects which have reference cycles with their module's
-  dict are now cleared again. This causes issue #7140 to appear again.
+- Issue #4471: Add the IMAP.starttls() method to enable encryption on standard
+  IMAP4 connections.  Original patch by Lorenzo M. Catucci.
 
-- Issue #9416: Fix some issues with complex formatting where the
-  output with no type specifier failed to match the str output:
+- Issue #1466065: Add 'validate' option to base64.b64decode to raise an error if
+  there are non-base64 alphabet characters in the input.
 
-    - format(complex(-0.0, 2.0), '-') omitted the real part from the output,
-    - format(complex(0.0, 2.0), '-') included a sign and parentheses.
+- Issue #10386: Add __all__ to token module; this simplifies importing in
+  tokenize module and prevents leaking of private names through ``import *``.
 
-- Issue #7616: Fix copying of overlapping memoryview slices with the Intel
-  compiler.
+- Issue #4471: Properly shutdown socket in IMAP.shutdown().  Patch by Lorenzo
+  M. Catucci.
 
-- Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the
-  start byte and the continuation byte(s) are now considered invalid, instead
-  of the number of bytes specified by the start byte.
-  E.g.: '\xf1\x80AB'.decode('utf-8', 'replace') now returns u'\ufffdAB' and
-  replaces with U+FFFD only the start byte ('\xf1') and the continuation byte
-  ('\x80') even if '\xf1' is the start byte of a 4-bytes sequence.
-  Previous versions returned a single u'\ufffd'.
+- Fix IMAP.login() to work properly.
 
-- Issue #6543: Write the traceback in the terminal encoding instead of utf-8.
-  Fix the encoding of the modules filename. Patch written by Amaury Forgeot
-  d'Arc.
+- Issue #9244: multiprocessing pool worker processes could terminate
+  unexpectedly if the return value of a task could not be pickled.  Only the
+  ``repr`` of such errors are now sent back, wrapped in an
+  ``MaybeEncodingError`` exception.
 
-- Issue #9058: Remove assertions about INT_MAX in UnicodeDecodeError.
+- Issue #9244: The ``apply_async()`` and ``map_async()`` methods of
+  ``multiprocessing.Pool`` now accepts a ``error_callback`` argument.  This can
+  be a callback with the signature ``callback(exc)``, which will be called if
+  the target raises an exception.
 
-- Issue #8941: decoding big endian UTF-32 data in UCS-2 builds could crash
-  the interpreter with characters outside the Basic Multilingual Plane
-  (higher than 0x10000).
+- Issue #10022: The dictionary returned by the ``getpeercert()`` method of SSL
+  sockets now has additional items such as ``issuer`` and ``notBefore``.
 
-- In the str.format(), raise a ValueError when indexes to arguments are too
-  large.
+- ``usenetrc`` is now false by default for NNTP objects.
 
-- Issue #8766: Initialize _warnings module before importing the first module.
-  Fix a crash if an empty directory called "encodings" exists in sys.path.
+- Issue #1926: Add support for NNTP over SSL on port 563, as well as STARTTLS.
+  Patch by Andrew Vant.
 
-- PyObject_Dump() encodes unicode objects to utf8 with backslashreplace
-  (instead of strict) error handler to escape surrogates
+- Issue #10335: Add tokenize.open(), detect the file encoding using
+  tokenize.detect_encoding() and open it in read only mode.
 
-- Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute
-  indirectly Python signal handlers anymore because mywrite() ignores
-  exceptions (KeyboardInterrupt)
+- Issue #10321: Add support for binary data to smtplib.SMTP.sendmail, and a new
+  method send_message to send an email.message.Message object.
 
-- Issue #8092: Fix PyUnicode_EncodeUTF8() to support error handler producing
-  unicode string (eg. backslashreplace)
+- Issue #6011: sysconfig and distutils.sysconfig use the surrogateescape error
+  handler to parse the Makefile file.  Avoid a UnicodeDecodeError if the source
+  code directory name contains a non-ASCII character and the locale encoding is
+  ASCII.
 
-- Issue #8014: Setting a T_UINT or T_PYSSIZET attribute of an object with
-  PyMemberDefs could produce an internal error;  raise TypeError instead.
+- Issue #10329: The trace module writes reports using the input Python script
+  encoding, instead of the locale encoding.  Patch written by Alexander
+  Belopolsky.
 
-- Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is
-  passed to bytes or bytearray.
+- Issue #10126: Fix distutils' test_build when Python was built with
+  --enable-shared.
 
-- Issue #8329: Don't return the same lists from select.select when no fds are
-  changed.
+- Issue #9281: Prevent race condition with mkdir in distutils.  Patch by
+  Arfrever.
 
-- Raise a TypeError when trying to delete a T_STRING_INPLACE struct member.
+- Issue #10229: Fix caching error in gettext.
 
-- Issue #8226: sys.setfilesystemencoding() raises a LookupError if the encoding
-  is unknown
+- Issue #10252: Close file objects in a timely manner in distutils code and
+  tests.  Patch by Brian Brazil, completed by Éric Araujo.
 
-- Issue #1583863: An str subclass can now override the __str__ method
+- Issue #10180: Pickling file objects is now explicitly forbidden, since
+  unpickling them produced nonsensical results.
 
-- Issue #7072: isspace(0xa0) is true on Mac OS X
+- Issue #10311: The signal module now restores errno before returning from its
+  low-level signal handler.  Patch by Hallvard B Furuseth.
 
-C-API
------
+- Issue #10282: Add a ``nntp_implementation`` attribute to NNTP objects.
 
-- Issue #9834: Don't segfault in PySequence_GetSlice, PySequence_SetSlice, or
-  PySequence_DelSlice when the object doesn't have any mapping operations
-  defined.
+- Issue #10283: Add a ``group_pattern`` argument to NNTP.list().
 
-- Issue #5753: A new C API function, :cfunc:`PySys_SetArgvEx`, allows
-  embedders of the interpreter to set sys.argv without also modifying
-  sys.path.  This helps fix `CVE-2008-5983
-  <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5983>`_.
+- Issue #10155: Add IISCGIHandler to wsgiref.handlers to support IIS CGI
+  environment better, and to correct unicode environment values for WSGI 1.0.1.
 
-Library
--------
+- Issue #10281: nntplib now returns None for absent fields in the OVER/XOVER
+  response, instead of raising an exception.
 
-- Issue #5111: IPv6 Host in the Header is wrapped inside [ ]. Patch by Chandru.
+- wsgiref now implements and validates PEP 3333, rather than an experimental
+  extension of PEP 333.  (Note: earlier versions of Python 3.x may have
+  incorrectly validated some non-compliant applications as WSGI compliant; if
+  your app validates with Python <3.2b1+, but not on this version, it is likely
+  the case that your app was not compliant.)
 
-- Issue #4471: Properly shutdown socket in IMAP.shutdown().  Patch by
-  Lorenzo M. Catucci.
+- Issue #10280: NNTP.nntp_version should reflect the highest version advertised
+  by the server.
 
-- Fix IMAP.login() to work properly.
+- Issue #10184: Touch directories only once when extracting a tarfile.
 
-- Issue #10126: Fix distutils' test_build when Python was built with
-  --enable-shared.
+- Issue #10199: New package, ``turtledemo`` now contains selected demo scripts
+  that were formerly found under Demo/turtle.
 
-- Fix typo in one sdist option (medata-check).
-
-- Issue #9199: Fix incorrect use of distutils.cmd.Command.announce.
-
-- Issue #1718574: Fix options that were supposed to accept arguments but did
-  not in build_clib.
+- Issue #10265: Close file objects explicitly in sunau.  Patch by Brian Brazil.
 
-- Issue #9281: Prevent race condition with mkdir in distutils.  Patch by
-  Arfrever.
+- Issue #10266: uu.decode didn't close in_file explicitly when it was given as a
+  filename.  Patch by Brian Brazil.
 
-- Issue #10229: Fix caching error in gettext.
+- Issue #10110: Queue objects didn't recognize full queues when the maxsize
+  parameter had been reduced.
 
-- Issue #10252: Close file objects in a timely manner in distutils code and
-  tests.  Patch by Brian Brazil, completed by Éric Araujo.
+- Issue #10160: Speed up operator.attrgetter.  Patch by Christos Georgiou.
 
-- Issue #10311: The signal module now restores errno before returning from
-  its low-level signal handler.  Patch by Hallvard B Furuseth.
+- logging: Added style option to basicConfig() to allow %, {} or $-formatting.
 
-- The keyword only restriction for the places argument in
-  unittest.TestCase.assert[Not]AlmostEqual methods has been removed.
+- Issue #5729: json.dumps() now supports using a string such as '\t' for
+  pretty-printing multilevel objects.
 
-- Issue 6706: asyncore accept() method no longer raises EWOULDBLOCK/ECONNABORTED
-  on incomplete connection attempt but returns None instead.
+- Issue #10253: FileIO leaks a file descriptor when trying to open a file for
+  append that isn't seekable.  Patch by Brian Brazil.
 
-- Issue #10266: uu.decode didn't close in_file explicitly when it was given
-  as a filename.  Patch by Brian Brazil.
+- Support context manager protocol for file-like objects returned by mailbox
+  ``get_file()`` methods.
 
 - Issue #10246: uu.encode didn't close file objects explicitly when filenames
   were given to it.  Patch by Brian Brazil.
 
-- Issue #10253: FileIO leaks a file descriptor when trying to open a file
-  for append that isn't seekable.  Patch by Brian Brazil.
+- Issue #10198: fix duplicate header written to wave files when writeframes() is
+  called without data.
+
+- Close file objects in modulefinder in a timely manner.
+
+- Close a io.TextIOWrapper object in email.parser in a timely manner.
+
+- Close a file object in distutils.sysconfig in a timely manner.
+
+- Close a file object in pkgutil in a timely manner.
+
+- Issue #10233: Close file objects in a timely manner in the tarfile module and
+  its test suite.
+
+- Issue #10093: ResourceWarnings are now issued when files and sockets are
+  deallocated without explicit closing.  These warnings are silenced by default,
+  except in pydebug mode.
+
+- tarfile.py: Add support for all missing variants of the GNU sparse extensions
+  and create files with holes when extracting sparse members.
+
+- Issue #10218: Return timeout status from ``Condition.wait`` in threading.
+
+- Issue #7351: Add ``zipfile.BadZipFile`` spelling of the exception name and
+  deprecate the old name ``zipfile.BadZipfile``.
 
 - Issue #5027: The standard ``xml`` namespace is now understood by
   xml.sax.saxutils.XMLGenerator as being bound to
   http://www.w3.org/XML/1998/namespace.  Patch by Troy J. Farrell.
 
-- #7761: telnetlib.interact failures on Windows fixed.
+- Issue #5975: Add csv.unix_dialect class.
+
+- Issue #7761: telnetlib.interact failures on Windows fixed.
+
+- logging: Added style option to Formatter to allow %, {} or $-formatting.
+
+- Issue #5178: Added tempfile.TemporaryDirectory class that can be used as a
+  context manager.
+
+- Issue #1349106: Generator (and BytesGenerator) flatten method and Header
+  encode method now support a 'linesep' argument.
 
-- Issue #5117: Case normalization was needed on ntpath.relpath(). And
-  fixed root directory issue on posixpath.relpath(). (Ported working fixes
-  from ntpath)
+- Issue #5639: Add a *server_hostname* argument to ``SSLContext.wrap_socket`` in
+  order to support the TLS SNI extension.  ``HTTPSConnection`` and ``urlopen()``
+  also use this argument, so that HTTPS virtual hosts are now supported.
 
-- Issue #10041: The signature of optional arguments in socket.makefile()
-  didn't match that of io.open(), and they also didn't get forwarded
-  properly to TextIOWrapper in text mode.  Patch by Kai Zhu.
+- Issue #10166: Avoid recursion in pstats Stats.add() for many stats items.
+
+- Issue #10163: Skip unreadable registry keys during mimetypes initialization.
+
+- logging: Made StreamHandler terminator configurable.
+
+- logging: Allowed filters to be just callables.
+
+- logging: Added tests for _logRecordClass changes.
+
+- Issue #10092: Properly reset locale in calendar.Locale*Calendar classes.
+
+- logging: Added _logRecordClass, getLogRecordClass, setLogRecordClass to
+  increase flexibility of LogRecord creation.
+
+- Issue #5117: Case normalization was needed on ntpath.relpath().  Also fixed
+  root directory issue on posixpath.relpath().  (Ported working fixes from
+  ntpath.)
+
+- Issue #1343: xml.sax.saxutils.XMLGenerator now has an option
+  short_empty_elements to direct it to use self-closing tags when appropriate.
+
+- Issue #9807 (part 1): Expose the ABI flags in sys.abiflags.  Add --abiflags
+  switch to python-config for command line access.
+
+- Issue #6098: Don't claim DOM level 3 conformance in minidom.
+
+- Issue #5762: Fix AttributeError raised by ``xml.dom.minidom`` when an empty
+  XML namespace attribute is encountered.
+
+- Issue #2830: Add the ``html.escape()`` function, which quotes all problematic
+  characters by default.  Deprecate ``cgi.escape()``.
+
+- Issue #9409: Fix the regex to match all kind of filenames, for interactive
+  debugging in doctests.
+
+- Issue #9183: ``datetime.timezone(datetime.timedelta(0))`` will now return the
+  same instance as ``datetime.timezone.utc``.
+
+- Issue #7523: Add SOCK_CLOEXEC and SOCK_NONBLOCK to the socket module, where
+  supported by the system.  Patch by Nikita Vetoshkin.
+
+- Issue #10063: file:// scheme will stop accessing remote hosts via ftp
+  protocol. file:// urls had fallback to access remote hosts via ftp. This was
+  not correct, change is made to raise a URLError when a remote host is tried to
+  access via file:// scheme.
+
+- Issue #1710703: Write structures for an empty ZIP archive when a ZipFile is
+  created in modes 'a' or 'w' and then closed without adding any files. Raise
+  BadZipfile (rather than IOError) when opening small non-ZIP files.
+
+- Issue #10041: The signature of optional arguments in socket.makefile() didn't
+  match that of io.open(), and they also didn't get forwarded properly to
+  TextIOWrapper in text mode.  Patch by Kai Zhu.
+
+- Issue #9003: http.client.HTTPSConnection, urllib.request.HTTPSHandler and
+  urllib.request.urlopen now take optional arguments to allow for server
+  certificate checking, as recommended in public uses of HTTPS.
 
 - Issue #6612: Fix site and sysconfig to catch os.getcwd() error, eg. if the
   current directory was deleted. Patch written by W. Trevor King.
 
+- Issue #3873: Speed up unpickling from file objects that have a peek() method.
+
+- Issue #10075: Add a session_stats() method to SSLContext objects.
+
+- Issue #9948: Fixed problem of losing filename case information.
+
+Extension Modules
+-----------------
+
+- Issue #5109: array.array constructor will now use fast code when
+  initial data is provided in an array object with correct type.
+
+- Issue #6317: Now winsound.PlaySound only accepts unicode.
+
+- Issue #6317: Now winsound.PlaySound can accept non ascii filename.
+
+- Issue #9377: Use Unicode API for gethostname on Windows.
+
+- Issue #10143: Update "os.pathconf" values.
+
+- Issue #6518: Support context manager protcol for ossaudiodev types.
+
+- Issue #678250: Make mmap flush a noop on ACCESS_READ and ACCESS_COPY.
+
+- Issue #9054: Fix a crash occurring when using the pyexpat module with expat
+  version 2.0.1.
+
+- Issue #5355: Provide mappings from Expat error numbers to string descriptions
+  and backwards, in order to actually make it possible to analyze error codes
+  provided by ExpatError.
+
+- The Unicode database was updated to 6.0.0.
+
+C-API
+-----
+
+- Issue #10288: The deprecated family of "char"-handling macros
+  (ISLOWER()/ISUPPER()/etc) have now been removed: use Py_ISLOWER() etc instead.
+
+- Issue #9778: Hash values are now always the size of pointers. A new Py_hash_t
+  type has been introduced.
+
+Tools/Demos
+-----------
+
+- Issue #10117: Tools/scripts/reindent.py now accepts source files that use
+  encoding other than ASCII or UTF-8.  Source encoding is preserved when
+  reindented code is written to a file.
+
+- Issue #7287: Demo/imputil/knee.py was removed.
+
+Tests
+-----
+
+- Issue #3699: Fix test_bigaddrspace and extend it to test bytestrings as well
+  as unicode strings.  Initial patch by Sandro Tosi.
+
+- Issue #10294: Remove dead code form test_unicode_file.
+
+- Issue #10123: Don't use non-ascii filenames in test_doctest tests. Add a new
+  test specific to unicode (non-ascii name and filename).
+
+Build
+-----
+
+- Issue #10268: Add a --enable-loadable-sqlite-extensions option to configure.
+
+- Issue #8852: Allow the socket module to build on OpenSolaris.
+
+- Drop -OPT:Olimit compiler option.
+
+- Issue #10094: Use versioned .so files on GNU/kfreeBSD and the GNU Hurd.
+
+- Accept Oracle Berkeley DB 5.0 and 5.1 as backend for the dbm extension.
+
+- Issue #7473: avoid link errors when building a framework with a different set
+  of architectures than the one that is currently installed.
+
+
+What's New in Python 3.2 Alpha 3?
+=================================
+
+*Release date: 09-Oct-2010*
+
+Core and Builtins
+-----------------
+
+- Issue #10068: Global objects which have reference cycles with their module's
+  dict are now cleared again. This causes issue #7140 to appear again.
+
+- Issue #9738: Document PyErr_SetString() and PyErr_SetFromErrnoWithFilename()
+  encodings.
+
+- ast.literal_eval() can now handle negative numbers.  It is also a little more
+  liberal in what it accepts without compromising the safety of the evaluation.
+  For example, 3j+4 and 3+4+5 are both accepted.
+
+- Issue #10006: type.__abstractmethods__ now raises an AttributeError.  As a
+  result metaclasses can now be ABCs (see #9533).
+
+- Issue #8670: ctypes.c_wchar supports non-BMP characters with 32 bits wchar_t.
+
+- Issue #8670: PyUnicode_AsWideChar() and PyUnicode_AsWideCharString() replace
+  UTF-16 surrogate pairs by single non-BMP characters for 16 bits Py_UNICODE and
+  32 bits wchar_t (eg. Linux in narrow build).
+
+- Issue #10003: Allow handling of SIGBREAK on Windows. Fixes a regression
+  introduced by issue #9324.
+
+- Issue #9979: Create function PyUnicode_AsWideCharString().
+
+- Issue #7397: Mention that importlib.import_module() is probably what someone
+  really wants to be using in __import__'s docstring.
+
+- Issue #8521: Allow CreateKeyEx, OpenKeyEx, and DeleteKeyEx functions of winreg
+  to use named arguments.
+
+- Issue #9930: Remove bogus subtype check that was causing (e.g.)
+  float.__rdiv__(2.0, 3) to return NotImplemented instead of the expected 1.5.
+
+- Issue #9808: Implement os.getlogin for Windows. Patch by Jon Anglin.
+
+- Issue #9901: Destroying the GIL in Py_Finalize() can fail if some other
+  threads are still running.  Instead, reinitialize the GIL on a second call to
+  Py_Initialize().
+
+- All SyntaxErrors now have a column offset and therefore a caret when the error
+  is printed.
+
+- Issue #9252: PyImport_Import no longer uses a fromlist hack to return the
+  module that was imported, but instead gets the module from sys.modules.
+
+- Issue #9213: The range type_items now provides index() and count() methods, to
+  conform to the Sequence ABC.  Patch by Daniel Urban and Daniel Stutzbach.
+
+- Issue #7994: Issue a PendingDeprecationWarning if object.__format__ is called
+  with a non-empty format string.  This is an effort to future-proof user
+  code. If a derived class does not currently implement __format__ but later
+  adds its own __format__, it would most likely break user code that had
+  supplied a format string.  This will be changed to a DeprecationWaring in
+  Python 3.3 and it will be an error in Python 3.4.
+
+- Issue #9828: Destroy the GIL in Py_Finalize(), so that it gets properly
+  re-created on a subsequent call to Py_Initialize().  The problem (a crash)
+  wouldn't appear in 3.1 or 2.7 where the GIL's structure is more trivial.
+
+- Issue #9210: Configure option --with-wctype-functions was removed.  Using the
+  functions from the libc caused the methods .upper() and lower() to become
+  locale aware and created subtly wrong results.
+
+- Issue #9738: PyUnicode_FromFormat() and PyErr_Format() raise an error on a
+  non-ASCII byte in the format string.
+
+- Issue #4617: Previously it was illegal to delete a name from the local
+  namespace if it occurs as a free variable in a nested block.  This limitation
+  of the compiler has been lifted, and a new opcode introduced (DELETE_DEREF).
+
+- Issue #9804: ascii() now always represents unicode surrogate pairs as a single
+  ``\UXXXXXXXX``, regardless of whether the character is printable or not.
+  Also, the "backslashreplace" error handler now joins surrogate pairs into a
+  single character on UCS-2 builds.
+
+- Issue #9757: memoryview objects get a release() method to release the
+  underlying buffer (previously this was only done when deallocating the
+  memoryview), and gain support for the context management protocol.
+
+- Issue #9797: pystate.c wrongly assumed that zero couldn't be a valid
+  thread-local storage key.
+
+Library
+-------
+
+- Issue #2236: distutils' mkpath ignored the mode parameter.
+
+- Fix typo in one sdist option (medata-check).
+
+- Issue #9199: Fix incorrect use of distutils.cmd.Command.announce.
+
+- Issue #1718574: Fix options that were supposed to accept arguments but did
+  not in build_clib.
+
+- Issue #9437: Fix building C extensions with non-default LDFLAGS.
+
+- Issue #4661: email can now parse bytes input and generate either converted
+  7bit output or bytes output.  Email version bumped to 5.1.0.
+
+- Issue #1589: Add ssl.match_hostname(), to help implement server identity
+  verification for higher-level protocols.
+
 - Issue #9759: GzipFile now raises ValueError when an operation is attempted
   after the file is closed.  Patch by Jeffrey Finkelstein.
 
 - Issue #9042: Fix interaction of custom translation classes and caching in
   gettext.
 
+- Issue #6706: asyncore.dispatcher now provides a handle_accepted() method
+  returning a (sock, addr) pair which is called when a connection has been
+  established with a new remote endpoint.  This is supposed to be used as a
+  replacement for old handle_accept() and avoids the user to call accept()
+  directly.
+
 - Issue #9065: tarfile no longer uses "root" as the default for the uname and
   gname field.
 
-- Issue #8980: Fixed a failure in distutils.command check that was shadowed
-  by an environment that does not have docutils. Patch by Arfrever.
+- Issue #8980: Fixed a failure in distutils.command check that was shadowed by
+  an environment that does not have docutils.  Patch by Arfrever.
 
 - Issue #1050268: parseaddr now correctly quotes double quote and backslash
   characters that appear inside quoted strings in email addresses.
 
-- Issue #10004: quoprimime no longer generates a traceback when confronted
-  with invalid characters after '=' in a Q-encoded word.
+- Issue #10004: quoprimime no longer generates a traceback when confronted with
+  invalid characters after '=' in a Q-encoded word.
+
+- Issue #1491: BaseHTTPServer nows send a ``100 Continue`` response before
+  sending a 200 OK for the Expect: 100-continue request header.
+
+- Issue #9360: Cleanup and improvements to the nntplib module.  The API now
+  conforms to the philosophy of bytes and unicode separation in Python 3.  A
+  test suite has also been added.
+
+- Issue #9962: GzipFile now has the peek() method.
+
+- Issue #9090: When a socket with a timeout fails with EWOULDBLOCK or EAGAIN,
+  retry the select() loop instead of bailing out.  This is because select() can
+  incorrectly report a socket as ready for reading (for example, if it received
+  some data with an invalid checksum).
+
+- Issue #3612: Added new types to ctypes.wintypes. (CHAR and pointers)
 
 - Issue #9950: Fix socket.sendall() crash or misbehaviour when a signal is
-  received.  Now sendall() properly calls signal handlers if necessary,
-  and retries sending if these returned successfully, including on sockets
-  with a timeout.
+  received.  Now sendall() properly calls signal handlers if necessary, and
+  retries sending if these returned successfully, including on sockets with a
+  timeout.
+
+- Issue #9947: logging: Fixed locking bug in stopListening.
+
+- Issue #9945: logging: Fixed locking bugs in addHandler/removeHandler.
 
 - Issue #9936: Fixed executable lines' search in the trace module.
 
+- Issue #9790: Rework imports necessary for samefile and sameopenfile
+  in ntpath.
+
 - Issue #9928: Properly initialize the types exported by the bz2 module.
 
-- Issue #9854: The default read() implementation in io.RawIOBase now
-  handles non-blocking readinto() returning None correctly.
+- Issue #1675951: Allow GzipFile to work with unseekable file objects.  Patch by
+  Florian Festi.
 
-- Issue #9853: Fix the signature of SSLSocket.recvfrom() and
-  SSLSocket.sendto() to match the corresponding socket methods.
+- Logging: Added QueueListener class to facilitate logging usage for
+  performance-critical threads.
 
-- Issue #9792: In case of connection failure, socket.create_connection()
-  would swallow the exception and raise a new one, making it impossible
-  to fetch the original errno, or to filter timeout errors.  Now the
-  original error is re-raised.
+- Issue #9916: Add some missing errno symbols.
 
-- Issue #9826: OrderedDict.__repr__ can now handle self-referential
-  values:   d['x'] = d.
+- Issue #9877: Expose sysconfig.get_makefile_filename()
 
-- Issue #9758: When fcntl.ioctl() was called with mutable_flag set to True,
-  and the passed buffer was exactly 1024 bytes long, the buffer wouldn't
-  be updated back after the system call.  Original patch by Brian Brazil.
+- logging: Added hasHandlers() method to Logger and LoggerAdapter.
 
-- Issue #6656: fix locale.format_string to handle escaped percents
-  and mappings.
+- Issue #9908: Fix os.stat() on bytes paths under Windows 7.
 
-- Issue #1100562: Fix deep-copying of objects derived from the list and
-  dict types.  Patch by Michele Orrù and Björn Lindqvist.
+- Issue #2643: msync() is not called anymore when deallocating an open mmap
+  object, only munmap().
 
-- Issue #9753: Fixed socket.dup, which did not always work correctly
-  on Windows.
+- logging: Changed LoggerAdapter implementation internally, to make it easier to
+  subclass in a useful way.
 
-- Issue #1868: Eliminate subtle timing issues in thread-local objects by
-  getting rid of the cached copy of thread-local attribute dictionary.
+- logging: hasHandlers method was added to Logger, and isEnabledFor,
+  getEffectiveLevel, hasHandlers and setLevel were added to LoggerAdapter.
+  LoggerAdapter was introduced into the unit tests for logging.
 
-- Issue #8797: urllib2 does a retry for Basic Authentication failure instead of
-  falling into recursion.
+- Issue #1686: Fix string.Template when overriding the pattern attribute.
 
-- Issue #1194222: email.utils.parsedate now returns RFC2822 compliant four
-  character years even if the message contains RFC822 two character years.
+- Issue #9854: SocketIO objects now observe the RawIOBase interface in
+  non-blocking mode: they return None when an operation would block (instead of
+  raising an exception).
 
-- Issue #8750: Fixed MutableSet's methods to correctly handle
-  reflexive operations, namely x -= x and x ^= x.
+- Issue #1730136: Fix the comparison between a tk.font.Font and an object of
+  another kind.
 
-- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing
-  error handling when accepting a new connection.
+- Issue #9441: logging has better coverage for rotating file handlers.
 
-- Issue #658749: asyncore's connect() method now correctly interprets winsock
-  errors.
+- Issue #9865: collections.OrderedDict now has a __sizeof__ method.
 
-- Issue #9214: Set operations on KeysView or ItemsView in the collections
-  module now correctly return a set.  (Patch by Eli Bendersky.)
+- Issue #9854: The default read() implementation in io.RawIOBase now handles
+  non-blocking readinto() returning None correctly.
 
-- Issue #9617: Signals received during a low-level write operation aren't
-  ignored by the buffered IO layer anymore.
+- Issue #1552: socket.socketpair() now returns regular socket.socket objects
+  supporting the whole socket API (rather than the "raw" _socket.socket
+  objects).
 
-- Issue #9605: posix.getlogin() decodes the username with file filesystem
-  encoding and surrogateescape error handler. Patch written by David Watson.
+- Issue #9853: Fix the signature of SSLSocket.recvfrom() and SSLSocket.sendto()
+  to match the corresponding socket methods.
 
-- Issue #9603: posix.ttyname() and posix.ctermid() decode the terminal name
-  using the filesystem encoding and surrogateescape error handler. Patch
-  written by David Watson.
+- Issue 9840: Added a decorator to reprlib for wrapping __repr__ methods to make
+  them handle recursive calls within the same thread.
 
-- Issue #8688: MANIFEST files created by distutils now include a magic
-  comment indicating they are generated.  Manually maintained MANIFESTs
-  without this marker will not be overwritten or removed.
+- logging: Enhanced HTTPHandler with secure and credentials initializers.
 
-- Issue #7467: when reading a file from a ZIP archive, its CRC is checked
-  and a BadZipfile error is raised if it doesn't match (as used to be the
-  case in Python 2.5 and earlier).
+- Issue #767645: Set os.path.supports_unicode_filenames to True on Mac OS X.
 
-- Issue #9550: a BufferedReader could issue an additional read when the
-  original read request had been satisfied, which could block indefinitely
-  when the underlying raw IO channel was e.g. a socket.  Report and original
-  patch by Jason V. Miller.
+- Issue #9837: The read() method of ZipExtFile objects (as returned by
+  ZipFile.open()) could return more bytes than requested.
 
-- Issue #6915: Under Windows, os.listdir() didn't release the Global
-  Interpreter Lock around all system calls.  Original patch by Ryan Kelly.
+- Issue #9826: OrderedDict.__repr__ can now handle self-referential values:
+  d['x'] = d.
 
-- Issue #3757: thread-local objects now support cyclic garbage collection.
-  Thread-local objects involved in reference cycles will be deallocated
-  timely by the cyclic GC, even if the underlying thread is still running.
+- Issue #9825: Using __del__ in the definition of collections.OrderedDict made
+  it possible for the user to create self-referencing ordered dictionaries which
+  become permanently uncollectable GC garbage.  Reinstated the Python 3.1
+  approach of using weakref proxies so that reference cycles never get created
+  in the first place.
 
-- Fix Issue8280 - urllib2's Request method will remove fragements in the url.
-  This is how it is supposed to work, wget and curl do the same.  Previous
-  behavior was wrong.
+- Issue #9579, #9580: Fix os.confstr() for value longer than 255 bytes and
+  encode the value with filesystem encoding and surrogateescape (instead of
+  utf-8 in strict mode) . Patch written by David Watson.
 
-- Issue #2944: asyncore doesn't handle connection refused correctly.
+- Issue #9632: Remove sys.setfilesystemencoding() function: use PYTHONFSENCODING
+  environment variable to set the filesystem encoding at Python startup.
+  sys.setfilesystemencoding() creates inconsistencies because it is unable to
+  reencode all filenames in all objects.
 
-- Issue #3196: email header decoding is now forgiving if an RFC2047
-  encoded word encoded in base64 is lacking padding.
+- Issue #9410: Various optimizations to the pickle module, leading to speedups
+  up to 4x (depending on the benchmark).  Mostly ported from Unladen Swallow;
+  initial patch by Alexandre Vassalotti.
 
-- Issue #8447: Make distutils.sysconfig follow symlinks in the path to
-  the interpreter executable.  This fixes a failure of test_httpservers
-  on OS X.
+- The pprint module now supports printing OrderedDicts in their given order
+  (formerly, it would sort the keys).
 
-- Issue #7372: Fix pstats regression when stripping paths from profile
-  data generated with the profile module.
+- Logging: Added QueueHandler class to facilitate logging usage with
+  multiprocessing.
 
-- Issue #4108: In urllib.robotparser, if there are multiple 'User-agent: *'
-  entries, consider the first one.
+- Issue #9707: Rewritten reference implementation of threading.local which is
+  friendlier towards reference cycles.  This change is not normally visible
+  since an optimized C implementation (_thread._local) is used instead.
 
-- Issue #8397: Raise an error when attempting to mix iteration and regular
-  reads on a BZ2File object, rather than returning incorrect results.
+- Issue #6394: os.getppid() is now supported on Windows.  Note that it will
+  still return the id of the parent process after it has exited.  This process
+  id may even have been reused by another unrelated process.
 
-- Issue #7909: Do not touch paths with the special prefixes ``\\.\``
-  or ``\\?\`` in ntpath.normpath().
+- Issue #9792: In case of connection failure, socket.create_connection() would
+  swallow the exception and raise a new one, making it impossible to fetch the
+  original errno, or to filter timeout errors.  Now the original error is
+  re-raised.
 
-- Issue #5294: Fix the behavior of pdb's "continue" command when called
-  in the top-level debugged frame.
+- Issue #9758: When fcntl.ioctl() was called with mutable_flag set to True, and
+  the passed buffer was exactly 1024 bytes long, the buffer wouldn't be updated
+  back after the system call.  Original patch by Brian Brazil.
 
-- Issue #5727: Restore the ability to use readline when calling into pdb
-  in doctests.
+- Updates to the random module:
 
-- Issue #6719: In pdb, do not stop somewhere in the encodings machinery
-  if the source file to be debugged is in a non-builtin encoding.
+  * Document which parts of the module are guaranteed to stay the same across
+    versions and which parts are subject to change.
 
-- Issue #8048: Prevent doctests from failing when sys.displayhook has
-  been reassigned.
+  * Update the seed() method to use all of the bits in a string instead of just
+    the hash value.  This makes better use of the seed value and assures the
+    seeding is platform independent.  Issue #7889.
 
-- Issue #8015: In pdb, do not crash when an empty line is entered as
-  a breakpoint command.
+  * Improved the random()-->integer algorithm used in choice(), shuffle(),
+    sample(), randrange(), and randint().  Formerly, it used int(n*random())
+    which has a slight bias whenever n is not a power of two.  Issue #9025.
 
-- Issue #5146: Handle UID THREAD command correctly in imaplib.
+  * Improved documentation of arguments to randrange().  Issue #9379.
 
-- Issue #5147: Fix the header generated for cookie files written by
-  http.cookiejar.MozillaCookieJar.
+- collections.OrderedDict now supports a new method for repositioning keys to
+  either end.
 
-- Issue #8198: In pydoc, output all help text to the correct stream
-  when sys.stdout is reassigned.
+- Issue #9754: Similarly to assertRaises and assertRaisesRegexp, unittest test
+  cases now also have assertWarns and assertWarnsRegexp methods to check that a
+  given warning type was triggered by the code under test.
 
-- Issue #8230: Fix Lib/test/sortperf.py.
+- Issue #5506: BytesIO objects now have a getbuffer() method exporting a view of
+  their contents without duplicating them.  The view is both readable and
+  writable.
 
-- Issue #7395: Fix tracebacks in pstats interactive browser.
+- Issue #7566: Implement os.path.sameopenfile for Windows.
 
-- Issue #1713: Fix os.path.ismount(), which returned true for symbolic links
-  across devices.
+- Issue #9293: I/O streams now raise ``io.UnsupportedOperation`` when an
+  unsupported operation is attempted (for example, writing to a file open only
+  for reading).
 
-- Issue #8826: Properly load old-style "expires" attribute in http.cookies.
+- hashlib has two new constant attributes: algorithms_guaranteed and
+  algorithms_avaiable that respectively list the names of hash algorithms
+  guaranteed to exist in all Python implementations and the names of hash
+  algorithms available in the current process.
 
-- Issue #1690103: Fix initial namespace for code run with trace.main().
+- A new package ``concurrent.futures`` as defined by PEP 3148.
 
-- Issue #9354: Provide getsockopt() in asyncore's file_wrapper.
+C-API
+-----
 
-- Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when
-  re-initializing a buffered IO object by calling its ``__init__`` method.
+- Add PyErr_SyntaxLocationEx, which supports passing a column offset.
 
-- Issue #8620: when a Cmd is fed input that reaches EOF without a final
-  newline, it no longer truncates the last character of the last command line.
+- Issue #9834: Don't segfault in PySequence_GetSlice, PySequence_SetSlice, or
+  PySequence_DelSlice when the object doesn't have any mapping operations
+  defined.
 
-- Issue #3704: http.cookiejar was not properly handling URLs with a / in the
-  parameters.
+Tools/Demos
+-----------
 
-- Issue #4629: getopt raises an error if an argument ends with = whereas getopt
-  doesn't except a value (eg. --help= is rejected if getopt uses ['help='] long
-  options).
+- Issue #9188: The gdb extension now handles correctly narrow (UCS2) as well as
+  wide (UCS4) unicode builds for both the host interpreter (embedded inside gdb)
+  and the interpreter under test.
 
-- Issue #7895: platform.mac_ver() no longer crashes after calling os.fork()
+Tests
+-----
 
-- Issue #9323: Fixed a bug in trace.py that resulted in loosing the
-  name of the script being traced.  Patch by Eli Bendersky.
+- Issue #9308: Added tests for importing encoded modules that do not
+  depend on specific stdlib modules being encoded in a certain way.
 
-- Issue #9282: Fixed --listfuncs option of trace.py.  Thanks Eli
-  Bendersky for the patch.
+- Issue #1051: Add a script (Lib/test/make_ssl_certs.py) to generate the custom
+  certificate and private key files used by SSL-related certs.
 
-- Issue #1555570: email no longer inserts extra blank lines when a \r\n
-  combo crosses an 8192 byte boundary.
+- Issue #9978: Wait until subprocess completes initialization. (Win32KillTests
+  in test_os)
 
-- Issue #9243: Fix sndhdr module and add unit tests, contributed by James Lee.
+- Issue #7110: regrtest now sends test failure reports and single-failure
+  tracebacks to stderr rather than stdout.
 
-- Issue #9137: Fix issue in MutableMapping.update, which incorrectly
-  treated keyword arguments called 'self' or 'other' specially.
+- Issue #9628: fix runtests.sh -x option so more than one test can be excluded.
 
-- Issue #7646: The fnmatch pattern cache no longer grows without bound.
+- Issue #9899: Fix test_tkinter.test_font on various platforms.  Patch by Ned
+  Deily.
 
-- Issue #9136: Fix 'dictionary changed size during iteration'
-  RuntimeError produced when profiling the decimal module.  This was
-  due to a dangerous iteration over 'locals()' in Context.__init__.
+- Issue #9894: Do not hardcode ENOENT in test_subprocess.
 
-- Fix extreme speed issue in Decimal.pow when the base is an exact
-  power of 10 and the exponent is tiny (for example,
-  Decimal(10) ** Decimal('1e-999999999')).
+- Issue #9315: Added tests for the trace module.  Patch by Eli Bendersky.
 
-- Issue #9130: Fix validation of relative imports in parser module.
+- Issue #9323: Make test.regrtest.__file__ absolute, this was not always the
+  case when running profile or trace, for example.
 
-- Issue #9128: Fix validation of class decorators in parser module.
+- Issue #9568: Fix test_urllib2_localnet on OS X 10.3.
 
-- Issue #5468: urlencode to handle bytes type and other encodings in its query
-  parameter. Patch by Dan Mahn.
+Build
+-----
 
-- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop
-  module, ensure that the input string length is a multiple of the frame size
+- Issue #10062: Allow building on platforms which do not have sem_timedwait.
 
-- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor
-  raises an exception.
+- Issue #10054: Some platforms provide uintptr_t in inttypes.h.  Patch by Akira
+  Kitada.
 
-- Issue #9075: In the ssl module, remove the setting of a ``debug`` flag
-  on an OpenSSL structure.
+- Issue #10055: Make json C89-compliant in UCS4 mode.
 
-- Issue #8682: The ssl module now temporary increments the reference count of
-  a socket object got through ``PyWeakref_GetObject``, so as to avoid possible
-  deallocation while the object is still being used.
+- Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)
 
-- Issue #1368368: FancyURLOpener class changed to throw an Exception on wrong
-  password instead of presenting an interactive prompt. Older behavior can be
-  obtained by passing retry=True to http_error_xxx methods of FancyURLOpener.
+- Issue #1633863: Don't ignore $CC under AIX.
 
-- Issue #8203: Fix IDLE Credits dialog: view_file() uses its encoding argument.
+- Issue #9810: Compile bzip2 source files in Python's project file directly. It
+  used to be built with bzip2's makefile.
 
-- Issue #8720: fix regression caused by fix for #4050 by making getsourcefile
-  smart enough to find source files in the linecache.
+- Issue #9848: Stopping trying to build _weakref in setup.py as it is a built-in
+  module.
 
-- Issue #5610: feedparser no longer eats extra characters at the end of
-  a body part if the body part ends with a \r\n.
+- Issue #9806: python-config now has an ``--extension-suffix`` option that
+  outputs the suffix for dynamic libraries including the ABI version name
+  defined by PEP 3149.
 
-- Fix codecs.escape_encode to return the correct consumed size.
+- Issue #941346: Improve the build process under AIX and allow Python to be
+  built as a shared library.  Patch by Sébastien Sablé.
 
-- Issue #8897: Fix sunau module, use bytes to write the header. Patch written
-  by Thomas Jollans.
+- Issue #4026: Make the fcntl extension build under AIX.  Patch by Sébastien
+  Sablé.
 
-- Issue #6470: Drop UNC prefix in FixTk.
+- Issue #9701: The MacOSX installer can patch the shell profile to ensure that
+  the "bin" directory inside the framework is on the shell's search path. This
+  feature now also supports the ZSH shell.
 
-- Issue #4768: base64 encoded email body parts were incorrectly stored as
-  binary strings.  They are now correctly converted to strings.
 
-- Issue #8833: tarfile created hard link entries with a size field != 0 by
-  mistake.
+What's New in Python 3.2 Alpha 2?
+=================================
 
-- Charset.body_encode now correctly handles base64 encoding by encoding
-  with the output_charset before calling base64mime.encode.  Passes the
-  tests from 2.x issue #1368247.
+*Release date: 05-Sep-2010*
 
-- Issue #7150: Raise OverflowError if the result of adding or subtracting
-  timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range.
+Core and Builtins
+-----------------
 
-- Issue #4769: Fix main() function of the base64 module, use sys.stdin.buffer
-  and sys.stdout.buffer (instead of sys.stdin and sys.stdout) to use the bytes
-  API
+- Issue #9225: Remove the ROT_FOUR and DUP_TOPX opcode, the latter replaced by
+  the new (and simpler) DUP_TOP_TWO.  Performance isn't changed, but our
+  bytecode is a bit simplified.  Patch by Demur Rumed.
 
-- Issue #6662: Fix parsing of malformatted charref (&#bad;), patch written by
-  Fredrik Håård
+- Issue #9766: Rename poorly named variables exposed by _warnings to prevent
+  confusion with the proper variables names from 'warnings' itself.
 
-- Issue #6268: Fix seek() method of codecs.open(), don't read or write the BOM
-  twice after seek(0). Fix also reset() method of codecs, UTF-16, UTF-32 and
-  StreamWriter classes.
+- Issue #9212: dict_keys and dict_items now provide the isdisjoint() method, to
+  conform to the Set ABC.  Patch by Daniel Urban.
 
-- Issue #8782: Add a trailing newline in linecache.updatecache to the last line
-  of files without one.
+- Issue #9737: Fix a crash when trying to delete a slice or an item from a
+  memoryview object.
 
-- Issue #8729: Return NotImplemented from collections.Mapping.__eq__ when
-  comparing to a non-mapping.
+- Issue #9549: sys.setdefaultencoding() and PyUnicode_SetDefaultEncoding() are
+  now removed, since their effect was inexistent in 3.x (the default encoding is
+  hardcoded to utf-8 and cannot be changed).
 
-- Issue #8774: tabnanny uses the encoding cookie (#coding:...) to use the
-  correct encoding
+- Issue #7415: PyUnicode_FromEncodedObject() now uses the new buffer API
+  properly.  Patch by Stefan Behnel.
 
-- Issue #7507: Quote "!" in pipes.quote(); it is special to some shells.
+- Issue #5553: The Py_LOCAL_INLINE macro now results in inlining on most
+  platforms.  Previously, it inlined only when using Microsoft Visual C.
 
-- Issue #8663: distutils.log emulates backslashreplace error handler. Fix
-  compilation in a non-ASCII directory if stdout encoding is ASCII (eg. if
-  stdout is not a TTY).
+- Issue #9712: Fix tokenize on identifiers that start with non-ascii names.
 
-- Issue #1285086: Speed up urllib.parse functions: quote, quote_from_bytes,
-  unquote, unquote_to_bytes.
+- Issue #9688: __basicsize__ and __itemsize__ must be accessed as Py_ssize_t.
 
-- Issue #8688: Distutils now recalculates MANIFEST everytime.
+- Issue #9684: Added a definition for SIZEOF_WCHAR_T to PC/pyconfig.h, to match
+  the pyconfig.h generated by configure on other systems.
 
-- Issue #5099: subprocess.Popen.__del__ no longer references global objects
-  to prevent issues during interpreter shutdown.
+- Issue #9666: Only catch AttributeError in hasattr(). All other exceptions that
+  occur during attribute lookup are now propagated to the caller.
 
-- Issue #8681: Make the zlib module's error messages more informative when
-  the zlib itself doesn't give any detailed explanation.
+- Issue #8622: Add PYTHONFSENCODING environment variable to override the
+  filesystem encoding.
 
-- Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing
-  overflow checks in the audioop module.
+- Issue #5127: The C functions that access the Unicode Database now accept and
+  return characters from the full Unicode range, even on narrow unicode builds
+  (Py_UNICODE_TOLOWER, Py_UNICODE_ISDECIMAL, and others).  A visible difference
+  in Python is that unicodedata.numeric() now returns the correct value for
+  large code points, and repr() may consider more characters as printable.
 
-- Issue #8571: Fix an internal error when compressing or decompressing a
-  chunk larger than 1GB with the zlib module's compressor and decompressor
-  objects.
+- Issue #9425: Create PyModule_GetFilenameObject() function to get the filename
+  as a unicode object, instead of a byte string. Function needed to support
+  unencodable filenames. Deprecate PyModule_GetFilename() in favor on the new
+  function.
 
-- Issue #8573: asyncore _strerror() function might throw ValueError.
+- Issue #8063: Call _PyGILState_Init() earlier in Py_InitializeEx().
 
-- Issue #8483: asyncore.dispatcher's __getattr__ method produced confusing
-  error messages when accessing undefined class attributes because of the cheap
-  inheritance with the underlying socket object.
+- Issue #9612: The set object is now 64-bit clean under Windows.
 
-- Issue #7472: Fixed typo in email.encoders module; messages using ISO-2022
-  character sets will now consistently use a Content-Transfer-Encoding of
-  7bit rather than sometimes being marked as 8bit.
+- Issue #8202: sys.argv[0] is now set to '-m' instead of '-c' when searching for
+  the module file to be executed with the -m command line option.
 
-- Issue #4265: shutil.copyfile() was leaking file descriptors when disk fills.
-  Patch by Tres Seaver.
+- Issue #9599: Create PySys_FormatStdout() and PySys_FormatStderr() functions to
+  write a message formatted by PyUnicode_FromFormatV() to sys.stdout and
+  sys.stderr.
 
-- Issue #7755: Use an unencumbered audio file for tests.
+- Issue #9542: Create PyUnicode_FSDecoder() function, a ParseTuple converter:
+  decode bytes objects to unicode using PyUnicode_DecodeFSDefaultAndSize(); str
+  objects are output as-is.
 
-- Issue #8621: uuid.uuid4() returned the same sequence of values in the
-  parent and any children created using ``os.fork`` on MacOS X 10.6.
+- Issue #9203: Computed gotos are now enabled by default on supported compilers
+  (which are detected by the configure script).  They can still be disable
+  selectively by specifying --without-computed-gotos.
 
-- Issue #8567: Fix precedence of signals in Decimal module: when a
-  Decimal operation raises multiple signals and more than one of those
-  signals is trapped, the specification determines the order in which
-  the signals should be handled.  In many cases this order wasn't
-  being followed, leading to the wrong Python exception being raised.
+- Issue #9425: Create PyErr_WarnFormat() function, similar to PyErr_WarnEx() but
+  use PyUnicode_FromFormatV() to format the warning message.
 
-- Issue #7865: The close() method of :mod:`io` objects should not swallow
-  exceptions raised by the implicit flush().  Also ensure that calling
-  close() several times is supported.  Patch by Pascal Chambon.
+- Issue #8530: Prevent stringlib fastsearch from reading beyond the front of an
+  array.
 
-- Issue #4687: Fix accuracy of garbage collection runtimes displayed with
-  gc.DEBUG_STATS.
+- Issue #5319: Print an error if flushing stdout fails at interpreter shutdown.
 
-- Issue #8354: The siginterrupt setting is now preserved for all signals,
-  not just SIGCHLD.
+- Issue #9337: The str() of a float or complex number is now identical to its
+  repr().
 
-- Issue #8464: tarfile no longer creates files with execute permissions set
-  when mode="w|" is used.
+- Issue #9416: Fix some issues with complex formatting where the output with no
+  type specifier failed to match the str output:
 
-- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions
-  of the Linux kernel.  Patch by Yaniv Aknin.
+    - format(complex(-0.0, 2.0), '-') omitted the real part from the output,
+    - format(complex(0.0, 2.0), '-') included a sign and parentheses.
 
-- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked.
-  It should correctly return an empty response now.
+Extension Modules
+-----------------
 
-- Issue #8549: Fix compiling the _ssl extension under AIX.  Patch by
-  Sridhar Ratnakumar.
+- Issue #8013: time.asctime and time.ctime no longer call system
+  asctime and ctime functions.  The year range for time.asctime is now
+  1900 through maxint.  The range for time.ctime is the same as for
+  time.localtime.  The string produced by these functions is longer
+  than 24 characters when year is greater than 9999.
 
-- Issue #8391: os.execvpe() and os.getenv() supports unicode with surrogates
-  and bytes strings for environment keys and values, and use
-  sys.getfilesystemencoding() instead of sys.getdefautltencoding()
+- Issue #6608: time.asctime is now checking struct tm fields its input
+  before passing it to the system asctime.  Patch by MunSic Jeong.
 
-- Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown,
-  where the method could block indefinitely if called just before the
-  event loop started running.  This also fixes the occasional freezes
-  witnessed in test_httpservers.
+- Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file
+  descriptor is provided.  Patch by Pascal Chambon.
 
-- Issue #8524: When creating an SSL socket, the timeout value of the
-  original socket wasn't retained (instead, a socket with a positive timeout
-  would be turned into a non-blocking SSL socket).
+- Issue #7736: Release the GIL around calls to opendir() and closedir() in the
+  posix module.  Patch by Marcin Bachry.
 
-- Issue #5103: SSL handshake would ignore the socket timeout and block
-  indefinitely if the other end didn't respond.
+- Issue #4835: make PyLong_FromSocket_t() and PyLong_AsSocket_t() private to the
+  socket module, and fix the width of socket descriptors to be correctly
+  detected under 64-bit Windows.
 
-- The do_handshake() method of SSL objects now adjusts the blocking mode of
-  the SSL structure if necessary (as other methods already do).
+- Issue #1027206: Support IDNA in gethostbyname, gethostbyname_ex, getaddrinfo
+  and gethostbyaddr.  getnameinfo is now restricted to numeric addresses as
+  input.
 
-- Issue #8108: Fix the unwrap() method of SSL objects when the socket has
-  a non-infinite timeout.  Also make that method friendlier with applications
-  wanting to continue using the socket in clear-text mode, by disabling
-  OpenSSL's internal readahead.  Thanks to Darryl Miles for guidance.
+- Issue #9214: Set operations on a KeysView or ItemsView in collections now
+  correctly return a set.  Patch by Eli Bendersky.
 
-- Issue #8468: bz2.BZ2File() accepts str with surrogates and bytes filenames
+- Issue #5737: Add Solaris-specific mnemonics in the errno module.  Patch by
+  Matthew Ahrens.
 
-- Issue #8496: make mailcap.lookup() always return a list, rather than an
-  iterator.  Patch by Gregory Nofi.
+- Restore GIL in nis_cat in case of error. Decode NIS data to fs encoding, using
+  the surrogate error handler.
 
-- Issue #8195: Fix a crash in sqlite Connection.create_collation() if the
-  collation name contains a surrogate character.
+- Issue #665761: ``functools.reduce()`` will no longer mask exceptions other
+  than ``TypeError`` raised by the iterator argument.
 
-- Issue #8484: Load all ciphers and digest algorithms when initializing
-  the _ssl extension, such that verification of some SSL certificates
-  doesn't fail because of an "unknown algorithm".
+- Issue #9570: Use PEP 383 decoding in os.mknod and os.mkfifo.
 
-- Issue #4814: timeout parameter is now applied also for connections resulting
-  from PORT/EPRT commands.
+- Issue #6915: Under Windows, os.listdir() didn't release the Global Interpreter
+  Lock around all system calls.  Original patch by Ryan Kelly.
 
-- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response
-  code as stated in RFC-959 at chapter 5.4.
+- Issue #8524: Add a detach() method to socket objects, so as to put the socket
+  into the closed state without closing the underlying file descriptor.
 
-- Issue #8394: _ctypes.dlopen() accepts bytes, bytearray and str with
-  surrogates.
+- Issue #477863: Emit a ResourceWarning at shutdown if gc.garbage is not empty.
 
-- Issue #7606: XML-RPC traceback stored in X-traceback is now encoded to ASCII
-  using backslashreplace error handler
+- Issue #6869: Fix a refcount problem in the _ctypes extension.
 
-- Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters.
+- Issue #5504: ctypes should now work with systems where mmap can't be
+  PROT_WRITE and PROT_EXEC.
 
-- Issue #8383: pickle and pickletools use surrogatepass error handler when
-  encoding unicode as utf8 to support lone surrogates and stay compatible with
-  Python 2.x and 3.0
+- Issue #9507: Named tuple repr will now automatically display the right name in
+  a tuple subclass.
 
-- Issue #8179: Fix macpath.realpath() on a non-existing path.
+- Issue #9324: Add parameter validation to signal.signal on Windows in order to
+  prevent crashes.
 
-- Issue #8139: ossaudiodev didn't initialize its types properly, therefore
-  some methods (such as oss_mixer_device.fileno()) were not available.
-  Initial patch by Bertrand Janin.
+- Issue #9526: Remove some outdated (int) casts that were preventing the array
+  module from working correctly with arrays of more than 2**31 elements.
 
-- Issue #7512: shutil.copystat() could raise an OSError when the filesystem
-  didn't support chflags() (for example ZFS under FreeBSD).  The error is
-  now silenced.
+- Fix memory leak in ssl._ssl._test_decode_cert.
 
-- Issue #3890, #8222: Fix recv() and recv_into() on non-blocking SSL sockets.
-  Also, enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking
-  reads and writes are always retried by OpenSSL itself.
+- Issue #8065: Fix memory leak in readline module (from failure to free the
+  result of history_get_history_state()).
 
-- Issue #6716/2: Backslash-replace error output in compilall.
+- Issue #9450: Fix memory leak in readline.replace_history_item and
+  readline.remove_history_item for readline version >= 5.0.
 
-Extension Modules
------------------
+- Issue #8105: Validate file descriptor passed to mmap.mmap on Windows.
 
-- Issue #6317: Now winsound.PlaySound can accept non ascii filename.
+- Issue #8046: Add context manager protocol support and .closed property to mmap
+  objects.
 
-- Issue #9054: Fix a crash occurring when using the pyexpat module
-  with expat version 2.0.1.
+Library
+-------
 
-- Issue #10003: Allow handling of SIGBREAK on Windows. Fixes a regression
-  introduced by issue #9324.
+- Issue #7451: Improve decoding performance of JSON objects, and reduce the
+  memory consumption of said decoded objects when they use the same strings as
+  keys.
 
-- Issue #8734: Avoid crash in msvcrt.get_osfhandle() when an invalid file
-  descriptor is provided.  Patch by Pascal Chambon.
+- Issue #1100562: Fix deep-copying of objects derived from the list and dict
+  types.  Patch by Michele Orrù and Björn Lindqvist.
 
-- Issue #7736: Release the GIL around calls to opendir() and closedir()
-  in the posix module.  Patch by Marcin Bachry.
+- Issue #9753: Fixed socket.dup, which did not always work correctly on Windows.
 
-- Issue #4835: make PyLong_FromSocket_t() and PyLong_AsSocket_t() private
-  to the socket module, and fix the width of socket descriptors to be
-  correctly detected under 64-bit Windows.
+- Issue #9421: Made the get<type> methods consistently accept the vars and
+  default arguments on all parser classes.
 
-- Issue #665761: ``functools.reduce()`` will no longer mask exceptions
-  other than ``TypeError`` raised by the iterator argument.
+- Issue #7005: Fixed output of None values for RawConfigParser.write and
+  ConfigParser.write.
 
-- Issue #9570: Use PEP 383 decoding in os.mknod and os.mkfifo.
+- Issue #8990: array.fromstring() and array.tostring() get renamed to
+  frombytes() and tobytes(), respectively, to avoid confusion.  Furthermore,
+  array.frombytes(), array.extend() as well as the array.array() constructor now
+  accept bytearray objects.  Patch by Thomas Jollans.
 
-- Issue #9324: Add parameter validation to signal.signal on Windows in order
-  to prevent crashes.
+- Issue #808164: Fixed socket.close to avoid references to globals, to avoid
+  issues when socket.close is called from a __del__ method.
 
-- Issue #9526: Remove some outdated (int) casts that were preventing
-  the array module from working correctly with arrays of more than
-  2**31 elements.
+- Issue #9706: ssl module provides a better error handling in various
+  circumstances.
 
-- Fix memory leak in ssl._ssl._test_decode_cert.
+- Issue #1868: Eliminate subtle timing issues in thread-local objects by getting
+  rid of the cached copy of thread-local attribute dictionary.
 
-- Issue #8065: Fix memory leak in readline module (from failure to
-  free the result of history_get_history_state()).
+- Issue #1512791: In setframerate() in the wave module, non-integral frame rates
+  are rounded to the nearest integer.
 
-- Issue #9450: Fix memory leak in readline.replace_history_item and
-  readline.remove_history_item for readline version >= 5.0.
+- Issue #8797: urllib2 does a retry for Basic Authentication failure instead of
+  falling into recursion.
 
-- Issue #8105: Validate file descriptor passed to mmap.mmap on Windows.
+- Issue #1194222: email.utils.parsedate now returns RFC2822 compliant four
+  character years even if the message contains RFC822 two character years.
 
-- Issue #9422: Fix memory leak when re-initializing a struct.Struct object.
+- Issue #8750: Fixed MutableSet's methods to correctly handle reflexive
+  operations on its self, namely x -= x and x ^= x.
 
-- Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly
-  compared to other unix systems. In particular, os.getgroups() does
-  not reflect any changes made using os.setgroups() but basicly always
-  returns the same information as the id command.
+- Issue #9129: smtpd.py is vulnerable to DoS attacks deriving from missing error
+  handling when accepting a new connection.
 
-  os.getgroups() can now return more than 16 groups on MacOSX.
+- Issue #9601: ftplib now provides a workaround for non-compliant
+  implementations such as IIS shipped with Windows server 2003 returning invalid
+  response codes for MKD and PWD commands.
 
-- Issue #7384: If the system readline library is linked against
-  ncurses, do not link the readline module against ncursesw. The
-  additional restriction of linking the readline and curses modules
-  against the same curses library is currently not enabled.
+- Issue #658749: asyncore's connect() method now correctly interprets winsock
+  errors.
 
-- Issue #8973: Add __all__ to struct module; this ensures that
-  help(struct) includes documentation for the struct.Struct class.
+- Issue #9501: Fixed logging regressions in cleanup code.
 
-- Issue #2810: Fix cases where the Windows registry API returns
-  ERROR_MORE_DATA, requiring a re-try in order to get the complete result.
+- Fix functools.total_ordering() to skip methods inherited from object.
 
-Build
------
+- Issue #9572: Importlib should not raise an exception if a directory it thought
+  it needed to create was done concurrently by another process.
 
-- Issue #8852: Allow the socket module to build on OpenSolaris.
+- Issue #9617: Signals received during a low-level write operation aren't
+  ignored by the buffered IO layer anymore.
 
-- Issue #10054: Some platforms provide uintptr_t in inttypes.h.  Patch by
-  Akira Kitada.
+- Issue #843590: Make "macintosh" an alias to the "mac_roman" encoding.
 
-- Issue #10055: Make json C89-compliant in UCS4 mode.
+- Create os.fsdecode(): decode from the filesystem encoding with surrogateescape
+  error handler, or strict error handler on Windows.
 
-- Issue #6244: Allow detect_tkinter to look for Tcl/Tk 8.6.
+- Issue #3488: Provide convenient shorthand functions ``gzip.compress`` and
+  ``gzip.decompress``.  Original patch by Anand B. Pillai.
 
-- Issue #1633863: Don't ignore $CC under AIX.
+- Issue #8807: poplib.POP3_SSL class now accepts a context parameter, which is a
+  ssl.SSLContext object allowing bundling SSL configuration options,
+  certificates and private keys into a single (potentially long-lived)
+  structure.
 
-- Issue #9810: Compile bzip2 source files in python's project file
-  directly. It used to be built with bzip2's makefile.
+- Issue #8866: parameters passed to socket.getaddrinfo can now be specified as
+  single keyword arguments.
 
-- Issue #941346: Improve the build process under AIX and allow Python to
-  be built as a shared library.  Patch by Sébastien Sablé.
+- Address XXX comment in dis.py by having inspect.py prefer to reuse the dis.py
+  compiler flag values over defining its own.
 
-- Issue #4026: Make the fcntl extension build under AIX.  Patch by Sébastien
-  Sablé.
+- Issue #9147: Added dis.code_info() which is similar to show_code() but returns
+  formatted code information in a string rather than displaying on screen.
 
-- Issue #3101: Helper functions _add_one_to_index_C() and
-  _add_one_to_index_F() become _Py_add_one_to_index_C() and
-  _Py_add_one_to_index_F(), respectively.
+- Issue #9567: functools.update_wrapper now adds a __wrapped__ attribute
+  pointing to the original callable.
 
-- Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x.  Patch by
-  Sébastien Sablé.
+- Issue #3445: functools.update_wrapper now tolerates missing attributes on
+  wrapped callables.
 
-- Issue #3928: os.mknod() now available in Solaris, also.
+- Issue #5867: Add abc.abstractclassmethod and abc.abstractstaticmethod.
 
-- Issue #6716: Quote -x arguments of compileall in MSI installer.
-  Exclude 2to3 tests from compileall.
+- Issue #9605: posix.getlogin() decodes the username with file filesystem
+  encoding and surrogateescape error handler. Patch written by David Watson.
 
-- Issue #1628484: The Makefile doesn't ignore the CFLAGS environment
-  variable anymore.  It also forwards the LDFLAGS settings to the linker
-  when building a shared library.
+- Issue #9604: posix.initgroups() encodes the username using the fileystem
+  encoding and surrogateescape error handler. Patch written by David Watson.
 
-- Issue #9701: The MacOSX installer can patch the shell profile to ensure that
-  the "bin" directory inside the framework is on the shell's search path. This
-  feature now also supports the ZSH shell.
+- Issue #9603: posix.ttyname() and posix.ctermid() decode the terminal name
+  using the filesystem encoding and surrogateescape error handler. Patch written
+  by David Watson.
 
-- Issue #7473: avoid link errors when building a framework with a different
-  set of architectures than the one that is currently installed.
+- Issue #7647: The posix module now has the ST_RDONLY and ST_NOSUID constants,
+  for use with the statvfs() function.  Patch by Adam Jackson.
 
-Tests
------
+- Issue #8688: MANIFEST files created by distutils now include a magic comment
+  indicating they are generated.  Manually maintained MANIFESTs without this
+  marker will not be overwritten or removed.
 
-- Issue #3699: Fix test_bigaddrspace and extend it to test bytestrings
-  as well as unicode strings.  Initial patch by Sandro Tosi.
+- Issue #7467: when reading a file from a ZIP archive, its CRC is checked and a
+  BadZipfile error is raised if it doesn't match (as used to be the case in
+  Python 2.5 and earlier).
 
-- Issue #9628: fix runtests.sh -x option so more than one test can be excluded.
+- Issue #9550: a BufferedReader could issue an additional read when the original
+  read request had been satisfied, which could block indefinitely when the
+  underlying raw IO channel was e.g. a socket.  Report and original patch by
+  Jason V. Miller.
 
-- Issue #9894: Do not hardcode ENOENT in test_subprocess.
+- Issue #3757: thread-local objects now support cyclic garbage collection.
+  Thread-local objects involved in reference cycles will be deallocated timely
+  by the cyclic GC, even if the underlying thread is still running.
 
-- Issue #9315: Added tests for the trace module.  Patch by Eli Bendersky.
+- Issue #9452: Add read_file, read_string, and read_dict to the configparser
+  API; new source attribute to exceptions.
 
-- Issue #7564: Skip test_ioctl if another process is attached to /dev/tty.
+- Issue #6231: Fix xml.etree.ElementInclude to include the tail of the current
+  node.
 
-- Issue #8857: Provide a test case for socket.getaddrinfo.
+- Issue #8047: Fix the xml.etree serializer to return bytes by default.  Use
+  ``encoding="unicode"`` to generate a Unicode string.
 
-- Issue #8433: Fix test_curses failure with newer versions of ncurses.
+- Issue #8280: urllib2's Request method will remove fragments in the url.  This
+  is how it is supposed to work, wget and curl do the same.  Previous behavior
+  was wrong.
 
-- Issue #9496: Provide a test suite for the rlcompleter module.  Patch by
-  Michele Orrù.
+- Issue #6683: For SMTP logins we now try all authentication methods advertised
+  by the server.  Many servers are buggy and advertise authentication methods
+  they do not support in reality.
 
-- Issue #9251: test_threaded_import didn't fail when run through regrtest
-  if the import lock was disabled.
+- Issue #8814: function annotations (the ``__annotations__`` attribute) are now
+  included in the set of attributes copied by default by functools.wraps and
+  functools.update_wrapper.  Patch by Terrence Cole.
 
-- Issue #7449: Skip test_socketserver if threading support is disabled
+- Issue #2944: asyncore doesn't handle connection refused correctly.
 
-- Issue #8672: Add a zlib test ensuring that an incomplete stream can be
-  handled by a decompressor object without errors (it returns incomplete
-  uncompressed data).
+- Issue #4184: Private attributes on smtpd.SMTPChannel made public and deprecate
+  the private attributes. Add tests for smtpd module.
 
-- Issue #8629: Disable some test_ssl tests, since they give different
-  results with OpenSSL 1.0.0 and higher.
+- Issue #3196: email header decoding is now forgiving if an RFC2047 encoded word
+  encoded in base64 is lacking padding.
 
-- Issue #8533: regrtest uses backslashreplace error handler for stdout to avoid
-  UnicodeEncodeError (write non-ASCII character to stdout using ASCII encoding)
+- Issue #9444: Argparse now uses the first element of prefix_chars as the option
+  character for the added 'h/help' option if prefix_chars does not contain a
+  '-', instead of raising an error.
 
-- Issue #8576: Remove use of find_unused_port() in test_smtplib and
-  test_multiprocessing.  Patch by Paul Moore.
+- Issue #7372: Fix pstats regression when stripping paths from profile data
+  generated with the profile module.
 
-- Issue #8531: Skip test_ascii_formatd if ctypes module is missing
+- Issue #9428: Fix running scripts with the profile/cProfile modules from the
+  command line.
 
-- Issue #3864: Skip three test_signal tests on freebsd6 because they fail
-  if any thread was previously started, most likely due to a platform bug.
+- Issue #7781: Fix restricting stats by entry counts in the pstats interactive
+  browser.
 
-- Issue #8193: Fix test_zlib failure with zlib 1.2.4.
+- Issue #9209: Do not crash in the pstats interactive browser on invalid regular
+  expressions.
 
-- Issue #9568: Fix test_urllib2_localnet on OS X 10.3.
+- Update collections.OrderedDict to match the implementation in Py2.7 (based on
+  lists instead of weakly referenced Link objects).
 
-Documentation
--------------
+- Issue #8397: Raise an error when attempting to mix iteration and regular reads
+  on a BZ2File object, rather than returning incorrect results.
 
-- Issue #9817: Add expat COPYING file; add expat, libffi and expat licenses
-  to Doc/license.rst.
+- Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when
+  re-initializing a buffered IO object by calling its ``__init__`` method.
 
-- Issue #9255: Document that the 'test' package is meant for interal Python use
-  only.
+- Issue #1713: Fix os.path.ismount(), which returned true for symbolic links
+  across devices.
+
+- Issue #8826: Properly load old-style "expires" attribute in http.cookies.
+
+- Issue #1690103: Fix initial namespace for code run with trace.main().
+
+- Issue #7395: Fix tracebacks in pstats interactive browser.
+
+- Issue #8230: Fix Lib/test/sortperf.py.
+
+- Issue #8620: when a cmd.Cmd() is fed input that reaches EOF without a final
+  newline, it no longer truncates the last character of the last command line.
+
+- Issue #5146: Handle UID THREAD command correctly in imaplib.
+
+- Issue #5147: Fix the header generated for cookie files written by
+  http.cookiejar.MozillaCookieJar.
+
+- Issue #8198: In pydoc, output all help text to the correct stream when
+  sys.stdout is reassigned.
+
+- Issue #7909: Do not touch paths with the special prefixes ``\\.\`` or ``\\?\``
+  in ntpath.normpath().
 
-- Issue #7829: Document in dis that bytecode is an implementation detail.
+- Issue #1286: Allow using fileinput.FileInput as a context manager.
+
+- Add lru_cache() decorator to the functools module.
 
 Tools/Demos
 -----------
 
-- Issue #7287: Demo/imputil/knee.py was removed.
+- Fix ``Tools/scripts/checkpyc.py`` after PEP 3147.
 
+- Issue #8867: Fix ``Tools/scripts/serve.py`` to work with files containing
+  non-ASCII content.
 
+Tests
+-----
 
-What's New in Python 3.1.2?
-===========================
+- Issue #9601: Provide a test case for ftplib.parse257.
 
-*Release date: 2010-03-20*
+- Issue #8857: Provide a test case for socket.getaddrinfo.
 
-Core and Builtins
------------------
+- Issue #7564: Skip test_ioctl if another process is attached to /dev/tty.
 
-- Issue #7173: Generator finalization could invalidate sys.exc_info().
+- Issue #8433: Fix test_curses failure with newer versions of ncurses.
 
-Library
--------
+- Issue #9496: Provide a test suite for the rlcompleter module.  Patch by
+  Michele Orrù.
 
-- Issue #2698: The --compiler ignored was ignored for distutils' build_ext.
+- Issue #8687: provide a test suite for sched.py module.
 
-- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox
-  with Tcl/Tk-8.5.
+Build
+-----
+
+- Issue #1303434: Generate ZIP file containing all PDBs.
+
+- Issue #9193: PEP 3149 is accepted.
 
-- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of
-  the locale.
+- Issue #3101: Helper functions _add_one_to_index_C() and _add_one_to_index_F()
+  become _Py_add_one_to_index_C() and _Py_add_one_to_index_F(), respectively.
 
+- Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x.  Patch by
+  Sébastien Sablé.
 
-What's New in Python 3.1.2 release candidate 1?
-===============================================
+- Don't run pgen twice when using make -j.
 
-*Release date: 2010-03-06*
+
+What's New in Python 3.2 Alpha 1?
+=================================
+
+*Release date: 01-Aug-2010*
 
 Core and Builtins
 -----------------
 
-- Issue #7544: Preallocate thread memory before creating the thread to avoid
-  a fatal error in low memory condition.
+- Issue #8991: convertbuffer() rejects discontigious buffers.
+
+- Issue #7616: Fix copying of overlapping memoryview slices with the Intel
+  compiler.
+
+- Issue #8413: structsequence now subclasses tuple.
+
+- Issue #8271: during the decoding of an invalid UTF-8 byte sequence, only the
+  start byte and the continuation byte(s) are now considered invalid, instead of
+  the number of bytes specified by the start byte.  E.g.:
+  '\xf1\x80AB'.decode('utf-8', 'replace') now returns u'\ufffdAB' and replaces
+  with U+FFFD only the start byte ('\xf1') and the continuation byte ('\x80')
+  even if '\xf1' is the start byte of a 4-bytes sequence.  Previous versions
+  returned a single u'\ufffd'.
+
+- Issue #9011: A negated imaginary literal (e.g., "-7j") now has real part -0.0
+  rather than 0.0.  So "-7j" is now exactly equivalent to "-(7j)".
+
+- Be more specific in error messages about positional arguments.
+
+- Issue #8949: "z" format of PyArg_Parse*() functions doesn't accept bytes
+  objects, as described in the documentation.
+
+- Issue #6543: Write the traceback in the terminal encoding instead of utf-8.
+  Fix the encoding of the modules filename.  Patch written by Amaury Forgeot
+  d'Arc.
+
+- Issue #9011: Remove buggy and unnecessary (in 3.x) ST->AST compilation code
+  dealing with unary minus applied to a constant.  The removed code was mutating
+  the ST, causing a second compilation to fail.
+
+- Issue #850997: mbcs encoding (Windows only) handles errors argument: strict
+  mode raises unicode errors.  The encoder only supports "strict" and "replace"
+  error handlers, the decoder only supports "strict" and "ignore" error
+  handlers.  Patch written by Mark Hammond.
+
+- Issue #8850: Remove "w" and "w#" formats from PyArg_Parse*() functions, use
+  "w*" format instead. Add tests for "w*" format.
+
+- Issue #8592: PyArg_Parse*() functions raise a TypeError for "y", "u" and "Z"
+  formats if the string contains a null byte/character.  Write unit tests for
+  string formats.
+
+- Issue #7490: To facilitate sharing of doctests between 2.x and 3.x test
+  suites, the IGNORE_EXCEPTION_DETAIL directive now also ignores the module
+  location of the raised exception.
+
+- Issue #8969: On Windows, use mbcs codec in strict mode to encode and decode
+  filenames and enable os.fsencode().
+
+- Issue #9058: Remove assertions about INT_MAX in UnicodeDecodeError.
+
+- Issue #8941: Decoding big endian UTF-32 data in UCS-2 builds could crash the
+  interpreter with characters outside the Basic Multilingual Plane (higher than
+  0x10000).
+
+- Issue #8950: (See also issue #5080).  Py_ArgParse*() functions now raise
+  TypeError instead of giving a DeprecationWarning when a float is parsed using
+  the 'L' code (for long long).  (All other integer codes already raise
+  TypeError in this case.)
+
+- Issue #8922: Normalize the encoding name in PyUnicode_AsEncodedString() to
+  enable shortcuts for upper case encoding name. Add also a shortcut for
+  "iso-8859-1" in PyUnicode_AsEncodedString() and PyUnicode_Decode().
+
+- Issue #8838: Remove codecs.charbuffer_encode() function.  The buffer protocol
+  doesn't support "char buffer" anymore in Python 3.
+
+- Issue #8339: Remove "t#" format of PyArg_Parse*() functions, use "s#" or "s*"
+  instead.  codecs.charbuffer_encode() now accepts modifiable buffer objects
+  like bytearray.
+
+- Issue #8837: Remove "O?" format of PyArg_Parse*() functions.  The format is no
+  used anymore and it was never documented.
+
+- In str.format(), raise a ValueError when indexes to arguments are too large.
+
+- Issue #2844: Make int('42', n) consistently raise ValueError for invalid
+  integers n (including n = -909).
+
+- Issue #8188: Introduce a new scheme for computing hashes of numbers (instances
+  of int, float, complex, decimal.Decimal and fractions.Fraction) that makes it
+  easy to maintain the invariant that hash(x) == hash(y) whenever x and y have
+  equal value.
+
+- Issue #8748: Fix two issues with comparisons between complex and integer
+  objects.  (1) The comparison could incorrectly return True in some cases
+  (2**53+1 == complex(2**53) == 2**53), breaking transitivity of equality.
+  (2) The comparison raised an OverflowError for large integers, leading to
+  unpredictable exceptions when combining integers and complex objects in sets
+  or dicts.
+
+- Issue #8766: Initialize _warnings module before importing the first module.
+  Fix a crash if an empty directory called "encodings" exists in sys.path.
+
+- Issue #8589: Decode PYTHONWARNINGS environment variable with the file system
+  encoding and surrogateescape error handler instead of the locale encoding to
+  be consistent with os.environ.  Add PySys_AddWarnOptionUnicode() function.
+
+- PyObject_Dump() encodes unicode objects to utf8 with backslashreplace (instead
+  of strict) error handler to escape surrogates.
+
+- Issue #8715: Create PyUnicode_EncodeFSDefault() function: Encode a Unicode
+  object to Py_FileSystemDefaultEncoding with the "surrogateescape" error
+  handler, and return bytes.  If Py_FileSystemDefaultEncoding is not set, fall
+  back to UTF-8.
+
+- Enable shortcuts for common encodings in PyUnicode_AsEncodedString() for any
+  error handler, not only the default error handler (strict).
+
+- Issue #8610: Load file system codec at startup, and display a fatal error on
+  failure.  Set the file system encoding to utf-8 (instead of None) if getting
+  the locale encoding failed, or if nl_langinfo(CODESET) function is missing.
+
+- PyFile_FromFd() uses PyUnicode_DecodeFSDefault() instead of
+  PyUnicode_FromString() to support surrogates in the filename and use the right
+  encoding.
+
+- Issue #7507: Quote "!" in pipes.quote(); it is special to some shells.
+
+- PyUnicode_DecodeFSDefaultAndSize() uses surrogateescape error handler.
+
+- Issue #8419: Prevent the dict constructor from accepting non-string keyword
+  arguments.
+
+- Issue #8124: PySys_WriteStdout() and PySys_WriteStderr() don't execute
+  indirectly Python signal handlers anymore because mywrite() ignores exceptions
+  (KeyboardInterrupt).
+
+- Issue #8092: Fix PyUnicode_EncodeUTF8() to support error handler producing
+  unicode string (eg. backslashreplace).
+
+- Issue #8485: PyUnicode_FSConverter() doesn't accept byteearray objects
+  anymore, you have to convert your bytearray filenames to bytes.
+
+- Issue #7332: Remove the 16KB stack-based buffer in
+  PyMarshal_ReadLastObjectFromFile, which doesn't bring any noticeable benefit
+  compared to the dynamic memory allocation fallback.  Patch by Charles-François
+  Natali.
+
+- Issue #8417: Raise an OverflowError when an integer larger than sys.maxsize is
+  passed to bytes or bytearray.
+
+- Issue #7301: Add environment variable $PYTHONWARNINGS.
+
+- Issue #8329: Don't return the same lists from select.select when no fds are
+  changed.
+
+- Issue #8259: 1L << (2**31) no longer produces an 'outrageous shift error' on
+  64-bit machines.  The shift count for either left or right shift is permitted
+  to be up to sys.maxsize.
+
+- Ensure that tokenization of identifiers is not affected by locale.
 
-- Issue #7820: The parser tokenizer restores all bytes in the right if
-  the BOM check fails.
+- Issue #1222585: Added LDCXXSHARED for C++ support. Patch by Arfrever.
+
+- Raise a TypeError when trying to delete a T_STRING_INPLACE struct member.
+
+- Issue #8211: Save/restore CFLAGS around AC_PROG_CC in configure.in, in case it
+  is set.
+
+- Issue #8226: sys.setfilesystemencoding() raises a LookupError if the encoding
+  is unknown.
+
+- Issue #1583863: A str subclass can now override the __str__ method.
+
+- Issue #8014: Setting a T_UINT or T_PYSSIZET attribute of an object with
+  PyMemberDefs could produce an internal error; raise TypeError instead.
+
+- Issue #7845: Rich comparison methods on the complex type now return
+  NotImplemented rather than raising a TypeError when comparing with an
+  incompatible type; this allows user-defined classes to implement their own
+  comparisons with complex.
+
+- Issue #3137: Don't ignore errors at startup, especially a keyboard interrupt
+  (SIGINT). If an error occurs while importing the site module, the error is
+  printed and Python exits. Initialize the GIL before importing the site module.
+
+- Issue #7173: Generator finalization could invalidate sys.exc_info().
+
+- Issue #7544: Preallocate thread memory before creating the thread to avoid a
+  fatal error in low memory condition.
+
+- Issue #7820: The parser tokenizer restores all bytes in the right if the BOM
+  check fails.
 
 - Handle errors from looking up __prepare__ correctly.
 
-- Issue #5939: Add additional runtime checking to ensure a valid capsule
-  in Modules/_ctypes/callproc.c.
+- Issue #5939: Add additional runtime checking to ensure a valid capsule in
+  Modules/_ctypes/callproc.c.
 
 - Issue #7309: Fix unchecked attribute access when converting
-  UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to
-  strings.
+  UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to strings.
+
+- Issue #6902: Fix problem with built-in types format incorrectly with 0
+  padding.
+
+- Issue #7988: Fix default alignment to be right aligned for complex.__format__.
+  Now it matches other numeric types.
+
+- Issue #5988: Remove deprecated functions PyOS_ascii_formatd,
+  PyOS_ascii_strtod, and PyOS_ascii_atof.  Use PyOS_double_to_string and
+  PyOS_string_to_double instead.  See issue #5835 for the original deprecations.
+
+- Issue #7385: Fix a crash in `MemoryView_FromObject` when `PyObject_GetBuffer`
+  fails.  Patch by Florent Xicluna.
 
-- Issue #6902: Fix problem with built-in types format incorrectly with
-  0 padding.
+- Issue #7788: Fix an interpreter crash produced by deleting a list slice with
+  very large step value.
 
-- Issue #7988: Fix default alignment to be right aligned for
-  complex.__format__. Now it matches other numeric types.
+- Issue #7766: Change sys.getwindowsversion() return value to a named tuple and
+  add the additional members returned in an OSVERSIONINFOEX structure.  The new
+  members are service_pack_major, service_pack_minor, suite_mask, and
+  product_type.
 
-- Issue #7385: Fix a crash in `MemoryView_FromObject` when
-  `PyObject_GetBuffer` fails.  Patch by Florent Xicluna.
+- Issue #7561: Operations on empty bytearrays (such as `int(bytearray())`) could
+  crash in many places because of the PyByteArray_AS_STRING() macro returning
+  NULL.  The macro now returns a statically allocated empty string instead.
 
-- Issue #7788: Fix an interpreter crash produced by deleting a list
-  slice with very large step value.
+- Issue #6690: Optimize the bytecode for expressions such as `x in {1, 2, 3}`,
+  where the right hand operand is a set of constants, by turning the set into a
+  frozenset and pre-building it as a constant.  The comparison operation is made
+  against the constant instead of building a new set each time it is executed (a
+  similar optimization already existed which turned a list of constants into a
+  pre-built tuple).  Patch and additional tests by Dave Malcolm.
 
-- Issue #7561: Operations on empty bytearrays (such as `int(bytearray())`)
-  could crash in many places because of the PyByteArray_AS_STRING() macro
-  returning NULL.  The macro now returns a statically allocated empty
-  string instead.
+- Issue #7622: Improve the split(), rsplit(), splitlines() and replace() methods
+  of bytes, bytearray and unicode objects by using a common implementation based
+  on stringlib's fast search.  Patch by Florent Xicluna.
 
-- Issue #7632: Fix various str -> float conversion bugs present in 2.7
-  alpha 2, including: (1) a serious 'wrong output' bug that could
-  occur for long (> 40 digit) input strings, (2) a crash in dtoa.c
-  that occurred in debug builds when parsing certain long numeric
-  strings corresponding to subnormal values, (3) a memory leak for
-  some values large enough to cause overflow, and (4) a number of
-  flaws that could lead to incorrectly rounded results.
+- Issue #7632: Fix various str -> float conversion bugs present in 2.7 alpha 2,
+  including: (1) a serious 'wrong output' bug that could occur for long (> 40
+  digit) input strings, (2) a crash in dtoa.c that occurred in debug builds when
+  parsing certain long numeric strings corresponding to subnormal values, (3) a
+  memory leak for some values large enough to cause overflow, and (4) a number
+  of flaws that could lead to incorrectly rounded results.
+
+- The __complex__ method is now looked up on the class of instances to make it
+  consistent with other special methods.
+
+- Issue #7462: Implement the stringlib fast search algorithm for the `rfind`,
+  `rindex`, `rsplit` and `rpartition` methods.  Patch by Florent Xicluna.
 
 - Issue #7604: Deleting an unset slotted attribute did not raise an
   AttributeError.
 
-- Issue #7466: segmentation fault when the garbage collector is called
-  in the middle of populating a tuple.  Patch by Florent Xicluna.
+- Issue #7534: Fix handling of IEEE specials (infinities, nans, negative zero)
+  in ** operator.  The behaviour now conforms to that described in C99 Annex F.
+
+- Issue #1811: improve accuracy and cross-platform consistency for true division
+  of integers: the result of a/b is now correctly rounded for ints a and b (at
+  least on IEEE 754 platforms), and in particular does not depend on the
+  internal representation of an int.
+
+- Issue #6834: replace the implementation for the 'python' and 'pythonw'
+  executables on OSX.
+
+  These executables now work properly with the arch(1) command: ``arch -ppc
+  python`` will start a universal binary version of python in PPC mode (unlike
+  previous releases).
+
+- Issue #7466: Segmentation fault when the garbage collector is called in the
+  middle of populating a tuple.  Patch by Florent Xicluna.
 
 - Issue #7419: setlocale() could crash the interpreter on Windows when called
   with invalid values.
@@ -1211,65 +2452,776 @@ Core and Builtins
 - Issue #6077: On Windows, files opened with tempfile.TemporaryFile in "wt+"
   mode would appear truncated on the first '0x1a' byte (aka. Ctrl+Z).
 
-- Issue #7085: Fix crash when importing some extensions in a thread
-  on MacOSX 10.6.
+- Issue #7085: Fix crash when importing some extensions in a thread on MacOSX
+  10.6.
 
-- Issue #7298: fixes for range and reversed(range(...)).  Iteration
-  over range(a, b, c) incorrectly gave an empty iterator when a, b and
-  c fit in C long but the length of the range did not.  Also fix
-  several cases where reversed(range(a, b, c)) gave wrong results, and
-  fix a refleak for reversed(range(a, b, c)) with large arguments.
+- Issue #1757126: Fix the cyrillic-asian alias for the ptcp154 encoding.
 
-- Issue #7244: itertools.izip_longest() no longer ignores exceptions
-  raised during the formation of an output tuple.
+- Issue #6970: Remove redundant calls when comparing objects that don't
+  implement the relevant rich comparison methods.
+
+- Issue #7298: Fixes for range and reversed(range(...)).  Iteration over
+  range(a, b, c) incorrectly gave an empty iterator when a, b and c fit in C
+  long but the length of the range did not.  Also fix several cases where
+  reversed(range(a, b, c)) gave wrong results, and fix a refleak for
+  reversed(range(a, b, c)) with large arguments.
+
+- Issue #7244: itertools.izip_longest() no longer ignores exceptions raised
+  during the formation of an output tuple.
 
 - Issue #3297: On wide unicode builds, do not split unicode characters into
   surrogates.
 
+- Remove length limitation when constructing a complex number from a string.
+
+- Issue #1087418: Boost performance of bitwise operations for longs.
+
+- Support for AtheOS has been completely removed from the code base. It was
+  disabled since Python 3.0.
+
+- Support for several legacy threading libraries has been disabled. These
+  libraries are: Mach C threads, SunOS LWP, GNU pth, Irix threads. Support code
+  will be entirely removed in 3.3.
+
+- Support for OSF* has been disabled. If nobody stands up, support will be
+  removed in 3.3. See <http://bugs.python.org/issue8606>.
+
+- Peephole constant folding had missed UNARY_POSITIVE.
+
 - Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which
   fixes the problem of some exceptions being thrown at shutdown when the
   interpreter is killed. Patch by Adam Olsen.
 
-- Issue #7065: Fix a crash in bytes.maketrans and bytearray.maketrans when
-  using byte values greater than 127.  Patch by Derk Drukker.
+- Issue #7147: Remove support for compiling Python without complex number
+  support.
+
+- Issue #7120: logging: Removed import of multiprocessing which is causing crash
+  in GAE.
+
+- Issue #1754094: Improve the stack depth calculation in the compiler.  There
+  should be no other effect than a small decrease in memory use.  Patch by
+  Christopher Tur Lesniewski-Laas.
+
+- Issue #7065: Fix a crash in bytes.maketrans and bytearray.maketrans when using
+  byte values greater than 127.  Patch by Derk Drukker.
+
+- Issue #1571184: The Unicode database contains properties for more characters.
+  The tables for code points representing numeric values, white spaces or line
+  breaks are now generated from the official Unicode Character Database files,
+  and include information from the Unihan.txt file.
 
-- Issue #7019: Raise ValueError when unmarshalling bad long data, instead
-  of producing internally inconsistent Python longs.
+- Issue #7019: Raise ValueError when unmarshalling bad long data, instead of
+  producing internally inconsistent Python longs.
 
-- Issue #6990: Fix threading.local subclasses leaving old state around
-  after a reference cycle GC which could be recycled by new locals.
+- Issue #6990: Fix threading.local subclasses leaving old state around after a
+  reference cycle GC which could be recycled by new locals.
+
+- Issue #5460: Fix an ambiguity in the grammar.
+
+- Issue #1766304: Improve performance of membership tests on range objects.
+
+- Issue #6713: Improve performance of integer -> string conversions.
 
 - Issue #6846: Fix bug where bytearray.pop() returns negative integers.
 
-- Issue #6750: A text file opened with io.open() could duplicate its output
-  when writing from multiple threads at the same time.
+- Issue #6750: A text file opened with io.open() could duplicate its output when
+  writing from multiple threads at the same time.
+
+- Issue #6707: dir() on an uninitialized module caused a crash.
+
+- Issue #6540: Fixed crash for bytearray.translate() with invalid parameters.
+
+- Issue #6573: set.union() stopped processing inputs if an instance of self
+  occurred in the argument chain.
+
+- Issue #6070: On posix platforms import no longer copies the execute bit from
+  the .py file to the .pyc file if it is set.
+
+- Issue #1616979: Added the cp720 (Arabic DOS) encoding.
+
+- Issue #6428: Since Python 3.0, the __bool__ method must return a bool object,
+  and not an int.  Fix the corresponding error message, and the documentation.
+
+- The deprecated PyCObject has been removed.
+
+- Issue #6347: Include inttypes.h as well as stdint.h in pyport.h.  This fixes a
+  build failure on HP-UX: int32_t and uint32_t are defined in inttypes.h instead
+  of stdint.h on that platform.
+
+- Issue #6373: Fixed a SystemError when encoding with the latin-1 codec and the
+  'surrogateescape' error handler, a string which contains unpaired surrogates.
+
+- Issue #4856: Remove checks for win NT.
+
+- Issue #6687: PyBytes_FromObject() no longer accepts an integer as its argument
+  to construct a null-initialized bytes object.
+
+- Issue #1023290: Add from_bytes() and to_bytes() methods to integers.  These
+  methods allow the conversion of integers to bytes, and vice-versa.
+
+- Issue #7382: Fix bug in bytes.__getnewargs__ that prevented bytes instances
+  from being copied with copy.copy(), and bytes subclasses from being pickled
+  properly.
+
+- Code objects now support weak references.
+
+- Issue #7072: isspace(0xa0) is true on Mac OS X.
+
+- Issue #8084: PEP 370 now conforms to system conventions for framework builds
+  on MacOS X. That is, "python setup.py install --user" will install into
+  "~/Library/Python/2.7" instead of "~/.local".
+
+C-API
+-----
+
+- Issue #2443: A new macro, `Py_VA_COPY`, copies the state of the
+  variable argument list.  `Py_VA_COPY` is equivalent to C99
+  `va_copy`, but available on all python platforms.
+
+- PySlice_GetIndicesEx now clips the step to [-PY_SSIZE_T_MAX, PY_SSIZE_T_MAX]
+  instead of [-PY_SSIZE_T_MAX-1, PY_SSIZE_T_MAX].  This makes it safe to do
+  "step = -step" when reversing a slice.
+
+- Issue #5753: A new C API function, `PySys_SetArgvEx`, allows embedders of the
+  interpreter to set sys.argv without also modifying sys.path.  This helps fix
+  `CVE-2008-5983
+  <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5983>`_.
+
+- Add PyArg_ValidateKeywordArguments, which checks if all keyword arguments are
+  strings in an efficient manner.
+
+- Issue #8276: PyEval_CallObject() is now only available in macro form.  The
+  function declaration, which was kept for backwards compatibility reasons, is
+  now removed (the macro was introduced in 1997!).
+
+- Issue #7767: New function PyLong_AsLongLongAndOverflow added, analogous to
+  PyLong_AsLongAndOverflow.
+
+- Make PyUnicode_CompareWithASCIIString return not equal if the Python string
+  has '\0' at the end.
+
+- Issue #5080: The argument parsing functions PyArg_ParseTuple,
+  PyArg_ParseTupleAndKeywords, PyArg_VaParse, PyArg_VaParseTupleAndKeywords and
+  PyArg_Parse now raise a DeprecationWarning for float arguments passed with the
+  'L' format code.  This will become a TypeError in a future version of Python,
+  to match the behaviour of the other integer format codes.
+
+- Issue #7033: Function ``PyErr_NewExceptionWithDoc()`` added.
+
+- Issue #7414: 'C' code wasn't being skipped properly (for keyword arguments) in
+  PyArg_ParseTupleAndKeywords.
+
+- Issue #7228: Add '%lld' and '%llu' support to PyString_FromFormat(V) and
+  PyErr_Format, on machines with HAVE_LONG_LONG defined.
+
+- Issue #6151: Made PyDescr_COMMON conform to standard C (like PyObject_HEAD in
+  PEP 3123).  The PyDescr_TYPE and PyDescr_NAME macros should be should used for
+  accessing the d_type and d_name members of structures using PyDescr_COMMON.
+
+- Issue #6405: Remove duplicate type declarations in descrobject.h.
+
+- The code flags for old __future__ features are now available again.
+
+- Issue #5954: Add a PyFrame_GetLineNumber() function to replace most uses of
+  PyCode_Addr2Line().
+
+- Issue #5959: Add a PyCode_NewEmpty() function to create a new empty code
+  object at a specified file, function, and line number.
+
+- Issue #1419652: Change the first argument to PyImport_AppendInittab() to
+  ``const char *`` as the string is stored beyond the call.
+
+- Issue #2422: When compiled with the ``--with-valgrind`` option, the pymalloc
+  allocator will be automatically disabled when running under Valgrind.  This
+  gives improved memory leak detection when running under Valgrind, while taking
+  advantage of pymalloc at other times.
 
 Library
 -------
 
-- Issue #7154: urllib.request can now detect the proxy settings on OSX 10.6
-  (as long as the user didn't specify 'automatic proxy configuration').
+- In pdb, when Ctrl-C is entered while defining commands for a breakpoint, the
+  old commands are restored.
+
+- For traceback debugging, the pdb listing now also shows the locations where
+  the exception was originally (re)raised, if it differs from the last line
+  executed (e.g. in case of finally clauses).
+
+- The pdb command "source" has been added.  It displays the source code for a
+  given object, if possible.
+
+- The pdb command "longlist" has been added.  It displays the whole source code
+  for the current function.
+
+- Issue #1503502: Make pdb.Pdb easier to subclass by putting message and error
+  output into methods.
+
+- Issue #809887: Make the output of pdb's breakpoint deletions more consistent;
+  emit a message when a breakpoint is enabled or disabled.
+
+- Issue #5294: Fix the behavior of pdb's "continue" command when called in the
+  top-level debugged frame.
+
+- Issue #5727: Restore the ability to use readline when calling into pdb in
+  doctests.
+
+- Issue #6719: In pdb, do not stop somewhere in the encodings machinery if the
+  source file to be debugged is in a non-builtin encoding.
+
+- Issue #8048: Prevent doctests from failing when sys.displayhook has been
+  reassigned.
+
+- Issue #8015: In pdb, do not crash when an empty line is entered as a
+  breakpoint command.
+
+- In pdb, allow giving a line number to the "until" command.
+
+- Issue #1437051: For pdb, allow "continue" and related commands in .pdbrc
+  files.  Also, add a command-line option "-c" that runs a command as if given
+  in .pdbrc.
+
+- Issue #4179: In pdb, allow "list ." as a command to return to the currently
+  debugged line.
+
+- Issue #4108: In urllib.robotparser, if there are multiple ``User-agent: *``
+  entries, consider the first one.
+
+- Issue #6630: Allow customizing regex flags when subclassing the
+  string.Template class.
+
+- Issue #9411: Allow specifying an encoding for config files in the configparser
+  module.
+
+- Issue #1682942: Improvements to configparser: support alternate delimiters,
+  alternate comment prefixes and empty lines in values.
+
+- Issue #9354: Provide getsockopt() in asyncore's file_wrapper.
+
+- Issue #8966: ctypes: Remove implicit bytes-unicode conversion.
+
+- Issue #9378: python -m pickle <pickle file> will now load and display the
+  first object in the pickle file.
+
+- Issue #4770: Restrict binascii module to accept only bytes (as specified).
+  And fix the email package to encode to ASCII instead of ``raw-unicode-escape``
+  before ASCII-to-binary decoding.
+
+- Issue #9384: ``python -m tkinter`` will now display a simple demo applet.
+
+- The default size of the re module's compiled regular expression cache has been
+  increased from 100 to 500 and the cache replacement policy has changed from
+  simply clearing the entire cache on overflow to forgetting the least recently
+  used cached compiled regular expressions.  This is a performance win for
+  applications that use a lot of regular expressions and limits the impact of
+  the performance hit anytime the cache is exceeded.
+
+- Issue #7113: Speed up loading in configparser. Patch by Łukasz Langa.
+
+- Issue #9032: XML-RPC client retries the request on EPIPE error.  The EPIPE
+  error occurs when the server closes the socket and the client sends a big
+  XML-RPC request.
+
+- Issue #4629: getopt raises an error if an argument ends with "=", whereas
+  getopt doesn't accept a value (eg. --help= is rejected if getopt uses
+  ['help='] long options).
+
+- Issue #7989: Added pure python implementation of the `datetime` module.  The C
+  module is renamed to `_datetime` and if available, overrides all classes
+  defined in datetime with fast C impementation.  Python implementation is based
+  on the original python prototype for the datetime module by Tim Peters with
+  minor modifications by the PyPy project.  The test suite now tests `datetime`
+  module with and without `_datetime` acceleration using the same test cases.
+
+- Issue #7895: platform.mac_ver() no longer crashes after calling os.fork().
+
+- Issue #9323: Fixed a bug in trace.py that resulted in loosing the name of the
+  script being traced.  Patch by Eli Bendersky.
+
+- Issue #9282: Fixed --listfuncs option of trace.py.  Thanks Eli Bendersky for
+  the patch.
+
+- Issue #3704: http.cookiejar was not properly handling URLs with a / in the
+  parameters.
+
+- Issue #9268: ``pickletools.dis()`` now has an optional *annotate* argument
+  which controls printing of opcode descriptions in ``dis()`` output.
+
+- Issue #1555570: email no longer inserts extra blank lines when a \r\n combo
+  crosses an 8192 byte boundary.
+
+- Issue #9243: Fix sndhdr module and add unit tests, contributed by James Lee.
+
+- ``ast.literal_eval()`` now allows byte literals.
+
+- Issue #9137: Fix issue in MutableMapping.update, which incorrectly treated
+  keyword arguments called 'self' or 'other' specially.
+
+- ``ast.literal_eval()`` now allows set literals.
+
+- Issue #9164: Ensure that sysconfig handles duplicate -arch flags in CFLAGS.
+
+- Issue #7646: The fnmatch pattern cache no longer grows without bound.
+
+- Issue #9136: Fix 'dictionary changed size during iteration' RuntimeError
+  produced when profiling the decimal module.  This was due to a dangerous
+  iteration over 'locals()' in Context.__init__.
+
+- Fix extreme speed issue in Decimal.pow when the base is an exact power of 10
+  and the exponent is tiny (for example, ``Decimal(10) **
+  Decimal('1e-999999999')``).
+
+- Issue #9186: Fix math.log1p(-1.0) to raise ValueError, not OverflowError.
+
+- Issue #9130: Fix validation of relative imports in parser module.
+
+- Issue #9128: Fix validation of class decorators in parser module.
+
+- Issue #9094: python -m pickletools will now disassemble pickle files listed in
+  the command line arguments.  See output of python -m pickletools -h for more
+  details.
+
+- Issue #5468: urlencode to handle bytes type and other encodings in its query
+  parameter. Patch by Dan Mahn.
+
+- Issue #7673: Fix security vulnerability (CVE-2010-2089) in the audioop module,
+  ensure that the input string length is a multiple of the frame size.
+
+- Issue #6507: Accept source strings in dis.dis().  Original patch by Daniel
+  Urban.
+
+- Issue #7829: Clearly document that the dis module is exposing an
+  implementation detail that is not stable between Python VMs or releases.
+
+- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor
+  raises an exception.
+
+- Issue #9110: Addition of ContextDecorator to contextlib, for creating APIs
+  that act as both context managers and decorators. contextmanager changes to
+  use ContextDecorator.
+
+- Implement importlib.abc.SourceLoader and deprecate PyLoader and PyPycLoader
+  for removal in Python 3.4.
+
+- Issue #9064: pdb's "up" and "down" commands now accept an optional argument
+  giving the number of frames to go.
+
+- Issue #9018: os.path.normcase() now raises a TypeError if the argument is not
+  ``str`` or ``bytes``.
+
+- Issue #9075: In the ssl module, remove the setting of a ``debug`` flag on an
+  OpenSSL structure.
+
+- Issue #8682: The ssl module now temporary increments the reference count of a
+  socket object got through ``PyWeakref_GetObject``, so as to avoid possible
+  deallocation while the object is still being used.
+
+- Issue #1368368: FancyURLOpener class changed to throw an Exception on wrong
+  password instead of presenting an interactive prompt.  Older behavior can be
+  obtained by passing retry=True to http_error_xxx methods of FancyURLOpener.
+
+- Issue #8720: Fix regression caused by fix for #4050 by making getsourcefile
+  smart enough to find source files in the linecache.
+
+- Issue #5610: feedparser no longer eats extra characters at the end of a body
+  part if the body part ends with a ``\r\n``.
+
+- Issue #8986: math.erfc was incorrectly raising OverflowError for values
+  between -27.3 and -30.0 on some platforms.
+
+- Issue #8784: Set tarfile default encoding to 'utf-8' on Windows.
+
+- Issue #8966: If a ctypes structure field is an array of c_char, convert its
+  value to bytes instead of str (as done for c_char and c_char_p).
+
+- Issue #8188: Comparisons between Decimal and Fraction objects are now
+  permitted, returning a result based on the exact numerical values of the
+  operands.  This builds on issue #2531, which allowed Decimal-to-float
+  comparisons; all comparisons involving numeric types (bool, int, float,
+  complex, Decimal, Fraction) should now act as expected.
+
+- Issue #8897: Fix sunau module, use bytes to write the header. Patch written by
+  Thomas Jollans.
+
+- Issue #8899: time.struct_time now has class and attribute docstrings.
+
+- Issue #6470: Drop UNC prefix in FixTk.
+
+- Issue #4768: base64 encoded email body parts were incorrectly stored as binary
+  strings.  They are now correctly converted to strings.
+
+- Issue #8833: tarfile created hard link entries with a size field != 0 by
+  mistake.
+
+- Charset.body_encode now correctly handles base64 encoding by encoding with the
+  output_charset before calling base64mime.encode.  Passes the tests from 2.x
+  issue #1368247.
+
+- Issue #8845: sqlite3 Connection objects now have a read-only in_transaction
+  attribute that is True iff there are uncommitted changes.
+
+- Issue #1289118: datetime.timedelta objects can now be multiplied by float and
+  divided by float and int objects.  Results are rounded to the nearest multiple
+  of timedelta.resolution with ties resolved using round-half-to-even method.
+
+- Issue #7150: Raise OverflowError if the result of adding or subtracting
+  timedelta from date or datetime falls outside of the MINYEAR:MAXYEAR range.
+
+- Issue #8806: add SSL contexts support to ftplib.
+
+- Issue #4769: Fix main() function of the base64 module, use sys.stdin.buffer
+  and sys.stdout.buffer (instead of sys.stdin and sys.stdout) to use the bytes
+  API.
+
+- Issue #8770: Now sysconfig displays information when it's called as a script.
+  Initial idea by Sridhar Ratnakumar.
+
+- Issue #6662: Fix parsing of malformatted charref (&#bad;), patch written by
+  Fredrik Håård.
+
+- Issue #8540: Decimal module: rename the Context._clamp attribute to
+  Context.clamp and make it public.  This is useful in creating contexts that
+  correspond to the decimal interchange formats specified in IEEE 754.
+
+- Issue #6268: Fix seek() method of codecs.open(), don't read or write the BOM
+  twice after seek(0). Fix also reset() method of codecs, UTF-16, UTF-32 and
+  StreamWriter classes.
+
+- Issue #3798: sys.exit(message) writes the message to sys.stderr file, instead
+  of the C file stderr, to use stderr encoding and error handler.
+
+- Issue #8782: Add a trailing newline in linecache.updatecache to the last line
+  of files without one.
+
+- Issue #8729: Return NotImplemented from collections.Mapping.__eq__ when
+  comparing to a non-mapping.
+
+- Issue #8774: tabnanny uses the encoding cookie (#coding:...) to use the
+  correct encoding.
+
+- Issue #4870: Add an `options` attribute to SSL contexts, as well as several
+  ``OP_*`` constants to the `ssl` module.  This allows to selectively disable
+  protocol versions, when used in combination with `PROTOCOL_SSLv23`.
+
+- Issue #8759: Fixed user paths in sysconfig for posix and os2 schemes.
+
+- Issue #8663: distutils.log emulates backslashreplace error handler. Fix
+  compilation in a non-ASCII directory if stdout encoding is ASCII (eg. if
+  stdout is not a TTY).
+
+- Issue #8513: os.get_exec_path() supports b'PATH' key and bytes value.
+  subprocess.Popen() and os._execvpe() support bytes program name. Add
+  os.supports_bytes_environ flag: True if the native OS type of the environment
+  is bytes (eg. False on Windows).
+
+- Issue #8633: tarfile is now able to read and write archives with "raw" binary
+  pax headers as described in POSIX.1-2008.
+
+- Issue #1285086: Speed up urllib.parse functions: quote, quote_from_bytes,
+  unquote, unquote_to_bytes.
+
+- Issue #8688: Distutils now recalculates MANIFEST everytime.
+
+- Issue #8477: ssl.RAND_egd() and ssl._test_decode_cert() support str with
+  surrogates and bytes for the filename.
+
+- Issue #8550: Add first class ``SSLContext`` objects to the ssl module.
+
+- Issue #8681: Make the zlib module's error messages more informative when the
+  zlib itself doesn't give any detailed explanation.
+
+- The audioop module now supports sound fragments of length greater than 2**31
+  bytes on 64-bit machines, and is PY_SSIZE_T_CLEAN.
+
+- Issue #4972: Add support for the context manager protocol to the ftplib.FTP
+  class.
+
+- Issue #8664: In py_compile, create __pycache__ when the compiled path is
+  given.
+
+- Issue #8514: Add os.fsencode() function (Unix only): encode a string to bytes
+  for use in the file system, environment variables or the command line.
+
+- Issue #8571: Fix an internal error when compressing or decompressing a chunk
+  larger than 1GB with the zlib module's compressor and decompressor objects.
+
+- Issue #8603: Support bytes environmental variables on Unix: Add os.environb
+  mapping and os.getenvb() function. os.unsetenv() encodes str argument to the
+  file system encoding with the surrogateescape error handler (instead of
+  utf8/strict) and accepts bytes. posix.environ keys and values are now bytes.
+
+- Issue #8573: asyncore _strerror() function might throw ValueError.
+
+- Issue #8483: asyncore.dispatcher's __getattr__ method produced confusing error
+  messages when accessing undefined class attributes because of the cheap
+  inheritance with the underlying socket object.  The cheap inheritance has been
+  deprecated.
+
+- Issue #4265: shutil.copyfile() was leaking file descriptors when disk fills.
+  Patch by Tres Seaver.
+
+- Issue #8390: tarfile uses surrogateescape as the default error handler
+  (instead of replace in read mode or strict in write mode).
+
+- Issue #7755: Use an unencumbered audio file for tests.
+
+- Issue #8621: uuid.uuid4() returned the same sequence of values in the parent
+  and any children created using ``os.fork`` on MacOS X 10.6.
+
+- Issue #8567: Fix precedence of signals in Decimal module: when a Decimal
+  operation raises multiple signals and more than one of those signals is
+  trapped, the specification determines the order in which the signals should be
+  handled.  In many cases this order wasn't being followed, leading to the wrong
+  Python exception being raised.
+
+- Issue #7865: The close() method of :mod:`io` objects should not swallow
+  exceptions raised by the implicit flush().  Also qensure that calling close()
+  several times is supported.  Patch by Pascal Chambon.
+
+- Issue #4687: Fix accuracy of garbage collection runtimes displayed with
+  gc.DEBUG_STATS.
+
+- Issue #8354: The siginterrupt setting is now preserved for all signals, not
+  just SIGCHLD.
+
+- Issue #7192: webbrowser.get("firefox") now works on Mac OS X, as does
+  webbrowser.get("safari").
+
+- Issue #8464: tarfile no longer creates files with execute permissions set when
+  mode="w|" is used.
+
+- Issue #7834: Fix connect() of Bluetooth L2CAP sockets with recent versions of
+  the Linux kernel.  Patch by Yaniv Aknin.
+
+- Issue #8295: Added shutil.unpack_archive.
+
+- Issue #6312: Fixed http HEAD request when the transfer encoding is chunked.
+  It should correctly return an empty response now.
+
+- Issue #8546: Reject None given as the buffering argument to _pyio.open.
+
+- Issue #8549: Fix compiling the _ssl extension under AIX.  Patch by
+  Sridhar Ratnakumar.
+
+- Issue #6656: fix locale.format_string to handle escaped percents
+  and mappings.
+
+- Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown, where
+  the method could block indefinitely if called just before the event loop
+  started running.  This also fixes the occasional freezes witnessed in
+  test_httpservers.
+
+- Issue #8524: When creating an SSL socket, the timeout value of the original
+  socket wasn't retained (instead, a socket with a positive timeout would be
+  turned into a non-blocking SSL socket).
+
+- Issue #5103: SSL handshake would ignore the socket timeout and block
+  indefinitely if the other end didn't respond.
+
+- The do_handshake() method of SSL objects now adjusts the blocking mode of the
+  SSL structure if necessary (as other methods already do).
+
+- Issue #8391: os.execvpe() and os.getenv() supports unicode with surrogates and
+  bytes strings for environment keys and values.
+
+- Issue #8467: Pure Python implementation of subprocess encodes the error
+  message using surrogatepass error handler to support surrogates in the
+  message.
+
+- Issue #8468: bz2.BZ2File() accepts str with surrogates and bytes filenames.
+
+- Issue #8451: Syslog module now uses basename(sys.argv[0]) instead of the
+  string "python" as the *ident*.  openlog() arguments are all optional and
+  keywords.
+
+- Issue #8108: Fix the unwrap() method of SSL objects when the socket has a
+  non-infinite timeout.  Also make that method friendlier with applications
+  wanting to continue using the socket in clear-text mode, by disabling
+  OpenSSL's internal readahead.  Thanks to Darryl Miles for guidance.
+
+- Issue #8496: make mailcap.lookup() always return a list, rather than an
+  iterator.  Patch by Gregory Nofi.
+
+- Issue #8195: Fix a crash in sqlite Connection.create_collation() if the
+  collation name contains a surrogate character.
+
+- Issue #8484: Load all ciphers and digest algorithms when initializing the _ssl
+  extension, such that verification of some SSL certificates doesn't fail
+  because of an "unknown algorithm".
+
+- Issue #6547: Added the ignore_dangling_symlinks option to shutil.copytree.
+
+- Issue #1540112: Now allowing the choice of a copy function in shutil.copytree.
+
+- Issue #4814: timeout parameter is now applied also for connections resulting
+  from PORT/EPRT commands.
+
+- Issue #8463: added missing reference to bztar in shutil's documentation.
+
+- Issue #7154: urllib.request can now detect the proxy settings on OSX 10.6 (as
+  long as the user didn't specify 'automatic proxy configuration').
+
+- Issue #3817: ftplib.FTP.abort() method now considers 225 a valid response code
+  as stated in RFC-959 at chapter 5.4.
 
-- Issue #8412: os.system() now accepts bytes, bytearray and str with
+- Issue #8394: _ctypes.dlopen() accepts bytes, bytearray and str with
   surrogates.
 
+- Issue #850728: Add a *timeout* parameter to the `acquire()` method of
+  `threading.Semaphore` objects.  Original patch by Torsten Landschoff.
+
+- Issue #8322: Add a *ciphers* argument to SSL sockets, so as to change the
+  available cipher list.  Helps fix test_ssl with OpenSSL 1.0.0.
+
+- Issue #8393: subprocess accepts bytes, bytearray and str with surrogates for
+  the current working directory.
+
+- Issue #7606: XML-RPC traceback stored in X-traceback is now encoded to ASCII
+  using backslashreplace error handler.
+
+- Issue #8412: os.system() now accepts bytes, bytearray and str with surrogates.
+
+- Issue #2987: RFC2732 support for urlparse (IPv6 addresses). Patch by Tony
+  Locke and Hans Ulrich Niedermann.
+
+- Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters.
+
+- Issue #7316: The acquire() method of lock objects in the :mod:`threading`
+  module now takes an optional timeout argument in seconds.  Timeout support
+  relies on the system threading library, so as to avoid a semi-busy wait loop.
+
+- Issue #8383: pickle and pickletools use surrogatepass error handler when
+  encoding unicode as utf8 to support lone surrogates and stay compatible with
+  Python 2.x and 3.x.
+
+- Issue #7585: difflib context and unified diffs now place a tab between
+  filename and date, conforming to the 'standards' they were originally designed
+  to follow.  This improves compatibility with patch tools.
+
+- Issue #7472: Fixed typo in email.encoders module; messages using ISO-2022
+  character sets will now consistently use a Content-Transfer-Encoding of 7bit
+  rather than sometimes being marked as 8bit.
+
+- Issue #8375: test_distutils now checks if the temporary directory are still
+  present before it cleans them.
+
+- Issue #8374: Update the internal alias table in the :mod:`locale` module to
+  cover recent locale changes and additions.
+
+- Issue #8321: Give access to OpenSSL version numbers from the `ssl` module,
+  using the new attributes `ssl.OPENSSL_VERSION`, `ssl.OPENSSL_VERSION_INFO` and
+  `ssl.OPENSSL_VERSION_NUMBER`.
+
+- Add functools.total_ordering() and functools.cmp_to_key().
+
+- Issue #8257: The Decimal construct now accepts a float instance directly,
+  converting that float to a Decimal of equal value:
+
+     >>> Decimal(1.1)
+     Decimal('1.100000000000000088817841970012523233890533447265625')
+
+- Issue #8294: The Fraction constructor now accepts Decimal and float instances
+  directly.
+
+- Issue #7279: Comparisons involving a Decimal signaling NaN now signal
+  InvalidOperation instead of returning False.  (Comparisons involving a quiet
+  NaN are unchanged.)  Also, Decimal quiet NaNs are now hashable; Decimal
+  signaling NaNs remain unhashable.
+
+- Issue #2531: Comparison operations between floats and Decimal instances now
+  return a result based on the numeric values of the operands; previously they
+  returned an arbitrary result based on the relative ordering of id(float) and
+  id(Decimal).  See also issue #8188, which adds Decimal-to-Fraction
+  comparisons.
+
+- Added a subtract() method to collections.Counter().
+
+- Issue #8233: When run as a script, py_compile.py optionally takes a single
+  argument `-` which tells it to read files to compile from stdin.  Each line is
+  read on demand and the named file is compiled immediately.  (Original patch by
+  Piotr Ożarowski).
+
+- Backwards incompatible change: Unicode codepoints line tabulation (0x0B) and
+  form feed (0x0C) are now considered linebreaks, as specified in Unicode
+  Standard Annex #14.  See issue #7643.  http://www.unicode.org/reports/tr14/
+
+- Comparisons using one of <, <=, >, >= between a complex instance and a
+  Fractions instance now raise TypeError instead of returning True/False.  This
+  makes Fraction <=> complex comparisons consistent with int <=> complex, float
+  <=> complex, and complex <=> complex comparisons.
+
+- Issue #8139: ossaudiodev didn't initialize its types properly, therefore some
+  methods (such as oss_mixer_device.fileno()) were not available.  Initial patch
+  by Bertrand Janin.
+
+- Issue #8205: Remove the "Modules" directory from sys.path when Python is
+  running from the build directory (POSIX only).
+
+- Issue #7512: shutil.copystat() could raise an OSError when the filesystem
+  didn't support chflags() (for example ZFS under FreeBSD).  The error is now
+  silenced.
+
+- Issue #7860: platform.uname now reports the correct 'machine' type when Python
+  is running in WOW64 mode on 64 bit Windows.
+
+- Issue #3890, #8222: Fix recv() and recv_into() on non-blocking SSL sockets.
+  Also, enable the SSL_MODE_AUTO_RETRY flag on SSL sockets, so that blocking
+  reads and writes are always retried by OpenSSL itself.
+
 - Issue #4282: Fix the main function of the profile module for a non-ASCII
   script, open the file in binary mode and not in text mode with the default
   (utf8) encoding.
 
+- Issue #8179: Fix macpath.realpath() on a non-existing path.
+
+- Issue #8024: Update the Unicode database to 5.2.
+
+- Issue #8168: py_compile now handles files with utf-8 BOMS.
+
+- ``tokenize.detect_encoding`` now returns ``'utf-8-sig'`` when a UTF-8 BOM is
+  detected.
+
+- Issue #6716/2: Backslash-replace error output in compilall.
+
+- Issue #4961: Inconsistent/wrong result of askyesno function in tkMessageBox
+  with Tcl/Tk-8.5.
+
+- Issue #8140: extend compileall to compile single files.  Add -i option.
+
+- Issue #7356: ctypes.util: Make parsing of ldconfig output independent of the
+  locale.
+
+- The internals of the subprocess module on POSIX systems have been replaced by
+  an extension module (_posixsubprocess) so that the fork()+exec() can be done
+  safely without the possibility of deadlock in multithreaded applications.
+
+- subprocess.Popen now has restore_signals and start_new_session features.  The
+  default of restore_signals=True is a new behavior compared to earlier Python
+  versions.  This means that signals such as SIGPIPE are not ignored by default
+  in subprocesses launched by Python (Issue #1652).
+
+- Issue #6472: The xml.etree package is updated to ElementTree 1.3.  The
+  cElementTree module is updated too.
+
 - Issue #7774: Set sys.executable to an empty string if argv[0] has been set to
-  an non existent program name and Python is unable to retrieve the real
-  program name
+  an non existent program name and Python is unable to retrieve the real program
+  name.
+
+- Issue #7880: Fix sysconfig when the python executable is a symbolic link.
+
+- Issue #6509: fix re.sub to work properly when the pattern, the string, and the
+  replacement were all bytes.  Patch by Antoine Pitrou.
 
-- Issue #6509: fix re.sub to work properly when the pattern, the string, and
-  the replacement were all bytes. Patch by Antoine Pitrou.
+- The sqlite3 module was updated to pysqlite 2.6.0. This fixes several obscure
+  bugs and allows loading SQLite extensions from shared libraries.
 
-- Issue #1054943: Fix unicodedata.normalize('NFC', text) for the Public Review
-  Issue #29
+- Issue #1054943: Fix ``unicodedata.normalize('NFC', text)`` for the Public
+  Review Issue #29 (http://unicode.org/review/pr-29.html).
 
 - Issue #7494: fix a crash in _lsprof (cProfile) after clearing the profiler,
   reset also the pointer to the current pointer context.
 
+- Issue #7232: Add support for the context manager protocol to the TarFile
+  class.
+
 - Issue #7250: Fix info leak of os.environ across multi-run uses of
   wsgiref.handlers.CGIHandler.
 
@@ -1278,59 +3230,101 @@ Library
 - Issue #691291: codecs.open() should not convert end of lines on reading and
   writing.
 
-- Issue #7959: ctypes callback functions are now registered correctly
-  with the cycle garbage collector.
+- Issue #7869: logging: improved diagnostic for format-time errors.
+
+- Issue #7868: logging: added loggerClass attribute to Manager.
+
+- logging: Implemented PEP 391.
+
+- Issue #1537721: Add a writeheader() method to csv.DictWriter.
+
+- Issue #7959: ctypes callback functions are now registered correctly with the
+  cycle garbage collector.
 
-- Issue #6666: fix bug in trace.py that applied the list of directories
-  to be ignored only to the first file.  Noted by Bogdan Opanchuk.
+- Issue #5801: removed spurious empty lines in wsgiref.
 
-- Issue #7597: curses.use_env() can now be called before initscr().
-  Noted by Kan-Ru Chen.
+- Issue #6666: fix bug in trace.py that applied the list of directories to be
+  ignored only to the first file.  Noted by Bogdan Opanchuk.
+
+- Issue #7597: curses.use_env() can now be called before initscr().  Noted by
+  Kan-Ru Chen.
 
 - Issue #7310: fix the __repr__ of os.environ to show the environment variables.
 
 - Issue #7970: email.Generator.flatten now correctly flattens message/rfc822
   messages parsed by email.Parser.HeaderParser.
 
-- Issue #7361: Importlib was not handling bytecode files less than 8 bytes in
-  length properly.
+- Issue #7361: Importlib was not properly checking the number of bytes in
+  bytecode file when it was less then 8 bytes.
+
+- Issue #7633: In the decimal module, Context class methods (with the exception
+  of canonical and is_canonical) now accept instances of int and long wherever a
+  Decimal instance is accepted, and implicitly convert that argument to Decimal.
+  Previously only some arguments were converted.
 
 - Issue #7835: shelve should no longer produce mysterious warnings during
   interpreter shutdown.
 
-- Issue #6233: ElementTree failed converting unicode characters to XML
-  entities when they could't be represented in the requested output
-  encoding.  Patch by Jerry Chen.
+- Issue #2746: Don't escape ampersands and angle brackets ("&", "<", ">") in XML
+  processing instructions and comments.  These raw characters are allowed by the
+  XML specification, and are necessary when outputting e.g.  PHP code in a
+  processing instruction.  Patch by Neil Muller.
+
+- Issue #6233: ElementTree failed converting unicode characters to XML entities
+  when they could't be represented in the requested output encoding.  Patch by
+  Jerry Chen.
+
+- Issue #6003: add an argument to ``zipfile.Zipfile.writestr`` to specify the
+  compression type.
 
 - Issue #4772: Raise a ValueError when an unknown Bluetooth protocol is
   specified, rather than fall through to AF_PACKET (in the `socket` module).
-  Also, raise ValueError rather than TypeError when an unknown TIPC address
-  type is specified.  Patch by Brian Curtin.
+  Also, raise ValueError rather than TypeError when an unknown TIPC address type
+  is specified.  Patch by Brian Curtin.
 
-- Issue #6939: Fix file I/O objects in the `io` module to keep the original
-  file position when calling `truncate()`.  It would previously change the
-  file position to the given argument, which goes against the tradition of
+- Issue #6939: Fix file I/O objects in the `io` module to keep the original file
+  position when calling `truncate()`.  It would previously change the file
+  position to the given argument, which goes against the tradition of
   ftruncate() and other truncation APIs.  Patch by Pascal Chambon.
 
+- Issue #7610: Reworked implementation of the internal
+  :class:`zipfile.ZipExtFile` class used to represent files stored inside an
+  archive.  The new implementation is significantly faster and can be wrapped in
+  a :class:`io.BufferedReader` object for more speedups.  It also solves an
+  issue where interleaved calls to `read()` and `readline()` give wrong results.
+  Patch by Nir Aides.
+
+- Issue #6963: Added "maxtasksperchild" argument to multiprocessing.Pool,
+  allowing for a maximum number of tasks within the pool to be completed by the
+  worker before that worker is terminated, and a new one created to replace it.
+
 - Issue #7792: Registering non-classes to ABCs raised an obscure error.
 
 - Issue #7785: Don't accept bytes in FileIO.write().
 
+- Removed the functions 'verify' and 'vereq' from Lib/test/support.py.
+
 - Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when
   the release file is empty.
 
 - Issue #7561: Fix crashes when using bytearray objects with the posix
   module.
 
-- Issue #1670765: Prevent email.generator.Generator from re-wrapping
-  headers in multipart/signed MIME parts, which fixes one of the sources of
-  invalid modifications to such parts by Generator.
+- Issue #1670765: Prevent email.generator.Generator from re-wrapping headers in
+  multipart/signed MIME parts, which fixes one of the sources of invalid
+  modifications to such parts by Generator.
+
+- Issue #7703: Add support for the new buffer API to `binascii.a2bhqx`.  Patch
+  by Florent Xicluna, along with some additional tests.
+
+- Issue #7701: Fix crash in binascii.b2a_uu() in debug mode when given a 1-byte
+  argument.  Patch by Victor Stinner.
 
-- Issue #7701: Fix crash in binascii.b2a_uu() in debug mode when given a
-  1-byte argument.  Patch by Victor Stinner.
+- Issue #3299: Fix possible crash in the _sre module when given bad argument
+  values in debug mode.  Patch by Victor Stinner.
 
-- Issue #3299: Fix possible crash in the _sre module when given bad
-  argument values in debug mode.  Patch by Victor Stinner.
+- Issue #2846: Add support for gzip.GzipFile reading zero-padded files.  Patch
+  by Brian Curtin.
 
 - Issue #7681: Use floor division in appropiate places in the wave module.
 
@@ -1338,84 +3332,153 @@ Library
   Extension extra options may change the output without changing the .c
   file). Initial patch by Collin Winter.
 
-- Issue #7617: Make sure distutils.unixccompiler.UnixCCompiler recognizes
-  gcc when it has a fully qualified configuration prefix. Initial patch
-  by Arfrever.
+- Issue #7617: Make sure distutils.unixccompiler.UnixCCompiler recognizes gcc
+  when it has a fully qualified configuration prefix. Initial patch by Arfrever.
 
-- Issue #7105: Make WeakKeyDictionary and WeakValueDictionary robust against
-  the destruction of weakref'ed objects while iterating.
+- Issue #7105: Make WeakKeyDictionary and WeakValueDictionary robust against the
+  destruction of weakref'ed objects while iterating.
 
-- Issue #7455: Fix possible crash in cPickle on invalid input.  Patch by
-  Victor Stinner.
+- Issue #7455: Fix possible crash in cPickle on invalid input.  Patch by Victor
+  Stinner.
 
-- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when
-  opening an empty or very small file.
+- Issue #1628205: Socket file objects returned by socket.socket.makefile() now
+  properly handles EINTR within the read, readline, write & flush methods.  The
+  socket.sendall() method now properly handles interrupted system calls.
+
+- Issue #7471: Improve the performance of GzipFile's buffering mechanism, and
+  make it implement the `io.BufferedIOBase` ABC to allow for further speedups by
+  wrapping it in an `io.BufferedReader`.  Patch by Nir Aides.
 
-- Issue #7556: Make sure Distutils' msvc9compile reads and writes the
-  MSVC XML Manifest file in text mode so string patterns can be used
-  in regular expressions.
+- Issue #3972: http.client.HTTPConnection now accepts an optional source_address
+  parameter to allow specifying where your connections come from.
 
-- Issue #7552: Removed line feed in the base64 Authorization header in
-  the Distutils upload command to avoid an error when PyPI reads it.
-  This occurs on long passwords. Initial patch by JP St. Pierre.
+- socket.create_connection now accepts an optional source_address parameter.
+
+- Issue #5511: now zipfile.ZipFile can be used as a context manager.  Initial
+  patch by Brian Curtin.
+
+- Issue #7556: Make sure Distutils' msvc9compile reads and writes the MSVC XML
+  Manifest file in text mode so string patterns can be used in regular
+  expressions.
+
+- Issue #7552: Removed line feed in the base64 Authorization header in the
+  Distutils upload command to avoid an error when PyPI reads it.  This occurs on
+  long passwords. Initial patch by JP St. Pierre.
 
 - Issue #7231: urllib2 cannot handle https with proxy requiring auth.  Patch by
   Tatsuhiro Tsujikawa.
 
-- Issue #4757: `zlib.compress` and other methods in the zlib module now
-  raise a TypeError when given an `str` object (rather than a `bytes`-like
-  object).  Patch by Victor Stinner and Florent Xicluna.
+- Issue #4757: `zlib.compress` and other methods in the zlib module now raise a
+  TypeError when given an `str` object (rather than a `bytes`-like object).
+  Patch by Victor Stinner and Florent Xicluna.
 
 - Issue #7349: Make methods of file objects in the io module accept None as an
   argument where file-like objects (ie StringIO and BytesIO) accept them to mean
   the same as passing no argument.
 
-- Issue #5949: added check for correct lineends in input from IMAP server
-  in imaplib.
+- Issue #7357: tarfile no longer suppresses fatal extraction errors by default.
+
+- Issue #5949: added check for correct lineends in input from IMAP server in
+  imaplib.
+
+- Add count() and reverse() methods to collections.deque().
 
 - Fix variations of extending deques:  d.extend(d)  d.extendleft(d)  d+=d
 
-- Issue #6986: Fix crash in the JSON C accelerator when called with the
-  wrong parameter types.  Patch by Victor Stinner.
+- Issue #6986: Fix crash in the JSON C accelerator when called with the wrong
+  parameter types.  Patch by Victor Stinner.
+
+- Issue #7457: added a read_pkg_file method to
+  distutils.dist.DistributionMetadata.
 
-- Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is
-  generated in Distutils. Patch by Stephen Emslie.
+- logging: Added optional `secure` parameter to SMTPHandler, to enable use of
+  TLS with authentication credentials.
+
+- Issue #1923: Fixed the removal of meaningful spaces when PKG-INFO is generated
+  in Distutils.  Patch by Stephen Emslie.
 
 - Issue #4120: Drop reference to CRT from manifest when building extensions with
   msvc9compiler.
 
-- Issue #7410: deepcopy of itertools.count was resetting the count.
+- Issue #7333: The `posix` module gains an `initgroups()` function providing
+  access to the initgroups(3) C library call on Unix systems which implement it.
+  Patch by Jean-Paul Calderone.
+
+- Issue #7408: Fixed distutils.tests.sdist so it doesn't check for group
+  ownership when the group is not forced, because the group may be different
+  from the user's group and inherit from its container when the test is run.
 
 - Issue #4486: When an exception has an explicit cause, do not print its
-  implicit context too.  This affects the `traceback` module as well as
-  built-in exception printing.
+  implicit context too.  This affects the `traceback` module as well as built-in
+  exception printing.
+
+- Issue #1515: Enable use of deepcopy() with instance methods.  Patch by Robert
+  Collins.
+
+- Issue #7403: logging: Fixed possible race condition in lock creation.
+
+- Issue #6845: Add restart support for binary upload in ftplib.  The
+  `storbinary()` method of FTP and FTP_TLS objects gains an optional `rest`
+  argument.  Patch by Pablo Mouzo.
+
+- Issue #5788: `datetime.timedelta` objects get a new `total_seconds()` method
+  returning the total number of seconds in the duration.  Patch by Brian
+  Quinlan.
 
-- Issue #1488943: difflib.Differ() doesn't always add hints for tab characters
+- Issue #7133: SSL objects now support the new buffer API.
 
-- Issue #7354: distutils.tests.test_msvc9compiler - dragfullwindows can
-  be 2.
+- Issue #1488943: difflib.Differ() doesn't always add hints for tab characters.
 
-- Issue #3976: pprint for sets, frozensets, and dicts now succeed when
-  they contain unorderable types.
+- Issue #6123: tarfile now opens empty archives correctly and consistently
+  raises ReadError on empty files.
+
+- Issue #7354: distutils.tests.test_msvc9compiler - dragfullwindows can be 2.
 
 - Issue #5037: Proxy the __bytes__ special method instead to __bytes__ instead
   of __str__.
 
-- Issue #7341: Close the internal file object in the TarFile constructor in
-  case of an error.
+- Issue #7341: Close the internal file object in the TarFile constructor in case
+  of an error.
 
 - Issue #7293: distutils.test_msvc9compiler is fixed to work on any fresh
   Windows box. Help provided by David Bolen.
 
-- Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch
+- Issue #2054: ftplib now provides an FTP_TLS class to do secure FTP using TLS
+  or SSL.  Patch by Giampaolo Rodola'.
+
+- Issue #7328: pydoc no longer corrupts sys.path when run with the '-m' switch.
+
+- Issue #4969: The mimetypes module now reads the MIME database from the
+  registry under Windows.  Patch by Gabriel Genellina.
+
+- Issue #6816: runpy now provides a run_path function that allows Python code to
+  execute file paths that refer to source or compiled Python files as well as
+  zipfiles, directories and other valid sys.path entries that contain a
+  __main__.py file.  This allows applications that run other Python scripts to
+  support the same flexibility as the CPython command line itself.
+
+- Issue #7318: multiprocessing now uses a timeout when it fails to establish a
+  connection with another process, rather than looping endlessly.  The default
+  timeout is 20 seconds, which should be amply sufficient for local connections.
+
+- Issue #7197: Allow unittest.TextTestRunner objects to be pickled and
+  unpickled.  This fixes crashes under Windows when trying to run
+  test_multiprocessing in verbose mode.
 
-- Issue #7318: multiprocessing now uses a timeout when it fails to establish
-  a connection with another process, rather than looping endlessly. The
-  default timeout is 20 seconds, which should be amply sufficient for
-  local connections.
+- Issue #7893: ``unittest.TextTestResult`` is made public and a ``resultclass``
+  argument added to the TextTestRunner constructor allowing a different result
+  class to be used without having to subclass.
 
-- Issue #7282: Fix a memory leak when an RLock was used in a thread other
-  than those started through `threading.Thread` (for example, using
+- Issue #7588: ``unittest.TextTestResult.getDescription`` now includes the test
+  name in failure reports even if the test has a docstring.
+
+- Issue #3001: Add a C implementation of recursive locks which is used by
+  default when instantiating a `threading.RLock` object. This makes recursive
+  locks as fast as regular non-recursive locks (previously, they were slower by
+  10x to 15x).
+
+- Issue #7282: Fix a memory leak when an RLock was used in a thread other than
+  those started through `threading.Thread` (for example, using
   `_thread.start_new_thread()`).
 
 - Issue #7187: Importlib would not silence the IOError raised when trying to
@@ -1424,28 +3487,36 @@ Library
 - Issue #7264: Fix a possible deadlock when deallocating thread-local objects
   which are part of a reference cycle.
 
-- Issue #6896: mailbox.Maildir now invalidates its internal cache each time
-  a modification is done through it.  This fixes inconsistencies and test
-  failures on systems with slightly bogus mtime behaviour.
+- Issue #7211: Allow 64-bit values for the `ident` and `data` fields of kevent
+  objects on 64-bit systems.  Patch by Michael Broghton.
 
-- Issue #6665: Fix fnmatch to properly match filenames with newlines in them.
+- Issue #6896: mailbox.Maildir now invalidates its internal cache each time a
+  modification is done through it.  This fixes inconsistencies and test failures
+  on systems with slightly bogus mtime behaviour.
+
+- Issue #7246 & Issue #7208: getpass now properly flushes input before reading
+  from stdin so that existing input does not confuse it and lead to incorrect
+  entry or an IOError.  It also properly flushes it afterwards to avoid the
+  terminal echoing the input afterwards on OSes such as Solaris.
+
+- Issue #7233: Fix a number of two-argument Decimal methods to make sure that
+  they accept an int or long as the second argument.  Also fix buggy handling of
+  large arguments (those with coefficient longer than the current precision) in
+  shift and rotate.
+
+- Issue #4750: Store the basename of the original filename in the gzip FNAME
+  header as required by RFC 1952.
 
-- Issue #7246 & Issue #7208: getpass now properly flushes input before
-  reading from stdin so that existing input does not confuse it and
-  lead to incorrect entry or an IOError.  It also properly flushes it
-  afterwards to avoid the terminal echoing the input afterwards on
-  OSes such as Solaris.
+- Issue #1180: Added a new global option to ignore ~/.pydistutils.cfg in
+  Distutils.
 
-- Issue #7233: Fix a number of two-argument Decimal methods to make
-  sure that they accept an int or long as the second argument.  Also
-  fix buggy handling of large arguments (those with coefficient longer
-  than the current precision) in shift and rotate.
+- Issue #7218: Fix test_site for win32, the directory comparison was done with
+  an uppercase.
 
 - Issue #7205: Fix a possible deadlock when using a BZ2File object from
   several threads at once.
 
-- Issue #7071: byte-compilation in Distutils is now done with respect to
-  sys.dont_write_bytecode.
+- Issue #7077: logging: SysLogHandler now treats Unicode as per RFC 5424.
 
 - Issue #7099: Decimal.is_normal now returns True for numbers with exponent
   larger than emax.
@@ -1453,69 +3524,159 @@ Library
 - Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows
   platforms, and assorted locale fixes by Derk Drukker.
 
-- Issue #5833: Fix extra space character in readline completion with the
-  GNU readline library version 6.0.
+- Issue #5833: Fix extra space character in readline completion with the GNU
+  readline library version 6.0.
 
-- Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment
+- Issue #6894: Fixed the issue urllib2 doesn't respect "no_proxy" environment.
 
-- Issue #7082: When falling back to the MIME 'name' parameter, the
-  correct place to look for it is the Content-Type header.
+- Issue #7086: Added TCP support to SysLogHandler, and tidied up some
+  anachronisms in the code which were a relic of 1.5.2 compatibility.
+
+- Issue #7082: When falling back to the MIME 'name' parameter, the correct place
+  to look for it is the Content-Type header.
 
 - Make tokenize.detect_coding() normalize utf-8 and iso-8859-1 variants like the
   builtin tokenizer.
 
-- Issue #7048: Force Decimal.logb to round its result when that result
-  is too large to fit in the current precision.
+- Issue #7048: Force Decimal.logb to round its result when that result is too
+  large to fit in the current precision.
 
-- Issue #6236, #6348: Fix various failures in the I/O library under AIX
-  and other platforms, when using a non-gcc compiler. Patch by Derk Drukker.
+- Issue #6236, #6348: Fix various failures in the I/O library under AIX and
+  other platforms, when using a non-gcc compiler. Patch by Derk Drukker.
 
-- Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils.
+- Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...)  does now
+  always result in NULL.
 
-- Issue #4606: Passing 'None' if ctypes argtype is set to POINTER(...)
-  does now always result in NULL.
-
-- Issue #5042: Structure sub-subclass does now initialize correctly
-  with base class positional arguments.
+- Issue #5042: Structure sub-subclass does now initialize correctly with base
+  class positional arguments.
 
 - Issue #6882: Import uuid creates zombies processes.
 
 - Issue #6635: Fix profiler printing usage message.
 
+- Issue #6856: Add a filter keyword argument to TarFile.add().
+
 - Issue #6888: pdb's alias command was broken when no arguments were given.
 
-- Issue #6795: int(Decimal('nan')) now raises ValueError instead of
-  returning NaN or raising InvalidContext.  Also, fix infinite recursion
-  in long(Decimal('nan')).
+- Issue #6857: Default format() alignment should be '>' for Decimal instances.
+
+- Issue #6795: int(Decimal('nan')) now raises ValueError instead of returning
+  NaN or raising InvalidContext.  Also, fix infinite recursion in
+  long(Decimal('nan')).
 
-- Issue #6850: Fix bug in Decimal._parse_format_specifier for formats
-  with no type specifier.
+- Issue #6850: Fix bug in Decimal._parse_format_specifier for formats with no
+  type specifier.
 
 - Issue #6239: ctypes.c_char_p return value must return bytes.
 
-- Issue #6838: Use a list to accumulate the value instead of
-  repeatedly concatenating strings in http.client's
-  HTTPResponse._read_chunked providing a significant speed increase
-  when downloading large files servend with a Transfer-Encoding of 'chunked'.
+- Issue #6838: Use a list to accumulate the value instead of repeatedly
+  concatenating strings in http.client's HTTPResponse._read_chunked providing a
+  significant speed increase when downloading large files servend with a
+  Transfer-Encoding of 'chunked'.
 
-- Have importlib raise ImportError if None is found in sys.modules for a
-  module.
+- Trying to import a submodule from a module that is not a package, ImportError
+  should be raised, not AttributeError.
+
+- When the globals past to importlib.__import__() has __package__ set to None,
+  fall back to computing what __package__ should be instead of giving up.
+
+- Raise a TypeError when the name of a module to be imported for
+  importlib.__import__ is not a string (was raising an AttributeError before).
+
+- Allow the fromlist passed into importlib.__import__ to be any iterable.
+
+- Have importlib raise ImportError if None is found in sys.modules.
+
+- Issue #6054: Do not normalize stored pathnames in tarfile.
 
 - Issue #6794: Fix Decimal.compare_total and Decimal.compare_total_mag: NaN
   payloads are now ordered by integer value rather than lexicographically.
 
-- Issue #6163: Fixed HP-UX runtime library dir options in
-  distutils.unixcompiler. Initial patch by Sridhar Ratnakumar and
-  Michael Haubenwallner.
+- Issue #1356969: Add missing info methods in tix.HList.
 
-- Issue #7066: archive_util.make_archive now restores the cwd if an error is
-  raised. Initial patch by Ezio Melotti.
+- Issue #1522587: New constants and methods for the tix.Grid widget.
+
+- Issue #1250469: Fix the return value of tix.PanedWindow.panes.
+
+- Issue #1119673: Do not override tkinter.Text methods when creating a
+  ScrolledText.
+
+- Issue #6665: Fix fnmatch to properly match filenames with newlines in them.
+
+- Issue #1135: Add the XView and YView mix-ins to avoid duplicating the xview*
+  and yview* methods.
+
+- Issue #6629: Fix a data corruption issue in the new I/O library, which could
+  occur when writing to a BufferedRandom object (e.g. a file opened in "rb+" or
+  "wb+" mode) after having buffered a certain amount of data for reading. This
+  bug was not present in the pure Python implementation.
+
+- Issue #6622: Fix "local variable 'secret' referenced before assignment" bug in
+  POP3.apop.
+
+- Issue #2715: Remove remnants of Carbon.File from binhex module.
+
+- Issue #6595: The Decimal constructor now allows arbitrary Unicode decimal
+  digits in input, as recommended by the standard.  Previously it was restricted
+  to accepting [0-9].
+
+- Issue #6106: telnetlib.Telnet.process_rawq doesn't handle default WILL/WONT
+  DO/DONT correctly.
+
+- Issue #1424152: Fix for http.client, urllib.request to support SSL while
+  working through proxy.  Original patch by Christopher Li, changes made by
+  Senthil Kumaran.
+
+- Add importlib.abc.ExecutionLoader to represent the PEP 302 protocol for
+  loaders that allow for modules to be executed. Both importlib.abc.PyLoader and
+  PyPycLoader inherit from this class and provide implementations in relation to
+  other methods required by the ABCs.
+
+- importlib.abc.PyLoader did not inherit from importlib.abc.ResourceLoader like
+  the documentation said it did even though the code in PyLoader relied on the
+  abstract method required by ResourceLoader.
+
+- Issue #6431: Make Fraction type return NotImplemented when it doesn't know how
+  to handle a comparison without loss of precision.  Also add correct handling
+  of infinities and nans for comparisons with float.
+
+- Issue #6415: Fixed warnings.warn segfault on bad formatted string.
+
+- Issue #6358: The exit status of a command started with os.popen() was reported
+  differently than it did with python 2.x.
+
+- Issue #6323: The pdb debugger did not exit when running a script with a syntax
+  error.
+
+- Issue #3392: The subprocess communicate() method no longer fails in select()
+  when file descriptors are large; communicate() now uses poll() when possible.
+
+- Issue #6369: Fix an RLE decompression bug in the binhex module.
+
+- Issue #6344: Fixed a crash of mmap.read() when passed a negative argument.
+
+- The deprecated function string.maketrans has been removed.
+
+- Issue #4005: Fixed a crash of pydoc when there was a zip file present in
+  sys.path.
+
+- Issue #6218: io.StringIO and io.BytesIO instances are now picklable.
+
+- The os.get_exec_path() function to return the list of directories that will be
+  searched for an executable when launching a subprocess was added.
 
 - Issue #7481: When a threading.Thread failed to start it would leave the
   instance stuck in initial state and present in threading.enumerate().
 
-- Issue #1068268: The subprocess module now handles EINTR in internal
-  os.waitpid and os.read system calls where appropriate.
+- Issue #1068268: The subprocess module now handles EINTR in internal os.waitpid
+  and os.read system calls where appropriate.
+
+- Issue #6729: Added ctypes.c_ssize_t to represent ssize_t.
+
+- Issue #6247: The argparse module has been added to the standard library.
+
+- Issue #8235: _socket: Add the constant ``SO_SETFIB``.  SO_SETFIB is a socket
+  option available on FreeBSD 7.1 and newer.
 
 - Issue #9315: Fix for the trace module to record correct class name
   for tracing methods.
@@ -1523,127 +3684,254 @@ Library
 Extension Modules
 -----------------
 
-- Issue #9277: Fix bug in struct.pack for bools in standard mode
-  (e.g., struct.pack('>?')):  if conversion to bool raised an exception
-  then that exception wasn't properly propagated on machines where
-  char is unsigned.
+- Issue #9959: Tweak formula used for computing math.log of an integer,
+  making it marginally more accurate for exact powers of 2.
+
+- Issue #9422: Fix memory leak when re-initializing a struct.Struct object.
+
+- Issue #7900: The getgroups(2) system call on MacOSX behaves rather oddly
+  compared to other unix systems. In particular, os.getgroups() does not reflect
+  any changes made using os.setgroups() but basicly always returns the same
+  information as the id command. os.getgroups() can now return more than 16
+  groups on MacOSX.
+
+- Issue #6095: Make directory argument to os.listdir optional.
+
+- Issue #9277: Fix bug in struct.pack for bools in standard mode (e.g.,
+  struct.pack('>?')): if conversion to bool raised an exception then that
+  exception wasn't properly propagated on machines where char is unsigned.
+
+- Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x python when
+  they contain instances of old-style classes.
+
+- Issue #9165: Add new functions math.isfinite and cmath.isfinite, to accompany
+  existing isinf and isnan functions.
+
+- Issue #1578269: Implement os.symlink for Windows 6.0+.  Patch by Jason
+  R. Coombs.
+
+- In struct.pack, correctly propogate exceptions from computing the truth of an
+  object in the '?' format.
+
+- Issue #9000: datetime.timezone objects now have eval-friendly repr.
+
+- In the math module, correctly lookup __trunc__, __ceil__, and __floor__ as
+  special methods.
+
+- Issue #9005: Prevent utctimetuple() from producing year 0 or year 10,000.
+  Prior to this change, timezone adjustment in utctimetuple() could produce
+  tm_year value of 0 or 10,000.  Now an OverflowError is raised in these edge
+  cases.
 
-- Issue #5180: Fixed a bug that prevented loading 2.x pickles in 3.x
-  python when they contain instances of old-style classes.
+- Issue #6641: The ``datetime.strptime`` method now supports the ``%z``
+  directive.  When the ``%z`` directive is present in the format string, an
+  aware ``datetime`` object is returned with ``tzinfo`` bound to a
+  ``datetime.timezone`` instance constructed from the parsed offset.  If both
+  ``%z`` and ``%Z`` are present, the data in ``%Z`` field is used for timezone
+  name, but ``%Z`` data without ``%z`` is discarded.
 
-- Issue #7670: sqlite3: Fixed crashes when operating on closed connections.
+- Issue #5094: The ``datetime`` module now has a simple concrete class
+  implementing ``datetime.tzinfo`` interface.  Instances of the new class,
+  ``datetime.timezone``, return fixed name and UTC offset from their
+  ``tzname(dt)`` and ``utcoffset(dt)`` methods.  The ``dst(dt)`` method always
+  returns ``None``.  A class attribute, ``utc`` contains an instance
+  representing the UTC timezone.  Original patch by Rafe Kaplan.
+
+- Issue #8973: Add __all__ to struct module; this ensures that help(struct)
+  includes documentation for the struct.Struct class.
+
+- Issue #3129: Trailing digits in struct format string are no longer ignored.
+  For example, "1" or "ilib123" are now invalid formats and cause
+  ``struct.error`` to be raised.  Patch by Caleb Deveraux.
+
+- Issue #7384: If the system readline library is linked against ncurses, the
+  curses module must be linked against ncurses as well. Otherwise it is not safe
+  to load both the readline and curses modules in an application.
+
+- Issue #2810: Fix cases where the Windows registry API returns ERROR_MORE_DATA,
+  requiring a re-try in order to get the complete result.
+
+- Issue #8692: Optimize math.factorial: replace the previous naive algorithm
+  with an improved 'binary-split' algorithm that uses fewer multiplications and
+  allows many of the multiplications to be performed using plain C integer
+  arithmetic instead of PyLong arithmetic.  Also uses a lookup table for small
+  arguments.
+
+- Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing
+  overflow checks in the audioop module.
+
+- Issue #8644: The accuracy of td.total_seconds() has been improved (by
+  calculating with integer arithmetic instead of float arithmetic internally):
+  the result is now always correctly rounded, and is equivalent to ``td /
+  timedelta(seconds=1)``.
+
+- Issue #2706: Allow division of a timedelta by another timedelta: timedelta /
+  timedelta, timedelta % timedelta, timedelta // timedelta and divmod(timedelta,
+  timedelta) are all supported.
+
+- Issue #8314: Fix unsigned long long bug in libffi on Sparc v8.
+
+- Issue #8300: When passing a non-integer argument to struct.pack with any
+  integer format code, struct.pack first attempts to convert the non-integer
+  using its __index__ method.  If that method is non-existent or raises
+  TypeError it goes on to try the __int__ method, as described below.
+
+- Issue #8142: Update libffi to the 3.0.9 release.
+
+- Issue #6949: Allow the _dbm extension to be built with db 4.8.x.
+
+- Issue #6544: Fix a reference leak in the kqueue implementation's error
+  handling.
 
 - Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as
   msvcr100.dll is not a platform assembly anymore.
 
+- Issue #6508: Add posix.{getresuid,getresgid,setresuid,setresgid}.
+
 - Issue #7078: Set struct.__doc__ from _struct.__doc__.
 
+- Issue #3366: Add erf, erfc, expm1, gamma, lgamma functions to math module.
+
+- Issue #6877: It is now possible to link the readline extension to the libedit
+  readline emulation on OSX 10.5 or later.
+
 - Issue #6848: Fix curses module build failure on OS X 10.6.
 
+- Fix a segfault that could be triggered by expat with specially formed input.
+
+- Issue #6561: '\d' in a regex now matches only characters with Unicode category
+  'Nd' (Number, Decimal Digit).  Previously it also matched characters with
+  category 'No'.
+
+- Issue #4509: Array objects are no longer modified after an operation failing
+  due to the resize restriction in-place when the object has exported buffers.
+
+- Issue #2389: Array objects are now pickled in a portable manner.
+
 - Expat: Fix DoS via XML document with malformed UTF-8 sequences
   (CVE_2009_3560).
 
+- Issue #7242: On Solaris 9 and earlier calling os.fork() from within a thread
+  could raise an incorrect RuntimeError about not holding the import lock.  The
+  import lock is now reinitialized after fork.
+
 - Issue #7999: os.setreuid() and os.setregid() would refuse to accept a -1
   parameter on some platforms such as OS X.
 
-Tests
------
+- Build the ossaudio extension on GNU/kFreeBSD.
 
-- Issue #7924: Fix an intermittent 'XXX undetected error' failure in
-  test_capi (only seen so far on platforms where the curses module
-  wasn't built), due to an uncleared exception.
+- Issue #7347: winreg: Add CreateKeyEx and DeleteKeyEx, as well as fix a bug in
+  the return value of QueryReflectionKey.
 
-- issue #7728: test_timeout was changed to use test.support.bind_port
-  instead of a hard coded port.
+- Issue #7567: PyCurses_setupterm: Don't call ``setupterm`` twice.
 
-- Issue #7376: instead of running a self-test (which was failing) when called
-  with no arguments, doctest.py now gives a usage message.
+Build
+-----
 
-- Issue #7498: test_multiprocessing now uses test.support.find_unused_port
-  instead of a hardcoded port number in test_rapid_restart.
+- Use OpenSSL 1.0.0a on Windows.
 
-- Issue #7431: use TESTFN in test_linecache instead of trying to create a
-  file in the Lib/test directory, which might be read-only for the
-  user running the tests.
+- Issue #9280: Make sharedinstall depend on sharedmods.
 
-- Issue #7324: add a sanity check to regrtest argument parsing to
-  catch the case of an option with no handler.
+- Issue #9189: Make a user-specified CFLAGS, CPPFLAGS, or LDFLAGS setting
+  override the configure and makefile defaults, without deleting options the
+  user didn't intend to override.  Developers should no longer need to specify
+  OPT or EXTRA_CFLAGS, although those variables are still present for
+  backward-compatibility.
 
-- Issue #6551: test_zipimport could import and then destroy some modules of
-  the encodings package, which would make other tests fail further down
-  the road because the internally cached encoders and decoders would point
-  to empty global variables.
+- Issue #8854: Fix finding Visual Studio 2008 on Windows x64.
 
-- Issue #7295: Do not use a hardcoded file name in test_tarfile.
+- Issue #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for
+  multiprocessing only.
 
-- Issue #7270: Add some dedicated unit tests for multi-thread synchronization
-  primitives such as Lock, RLock, Condition, Event and Semaphore.
+- Issue #8625: Turn off optimization in --with-pydebug builds with gcc.
+  (Optimization was unintentionally turned on in gcc --with-pydebug builds as a
+  result of the issue #1628484 fix, combined with autoconf's strange choice of
+  default CFLAGS produced by AC_PROG_CC for gcc.)
 
-- Issue #7248 (part 2): Use a unique temporary directory for importlib source
-  tests instead of tempfile.tempdir. This prevents the tests from sharing state
-  between concurrent executions on the same system.
+- Issue #3646: It is now easily possible to install a Python framework into your
+  home directory on MacOSX, see Mac/README for more information.
 
-- Issue #7248: In importlib.test.source.util a try/finally block did not make
-  sure that some referenced objects actually were created in the block before
-  calling methods on the object.
+- Issue #3928: os.mknod() now available in Solaris, also.
 
-- Issue #7055: test___all__ now greedily detects all modules which have an
-  __all__ attribute, rather than using a hardcoded and incomplete list.
+- Issue #3326: Build Python without -fno-strict-aliasing when the gcc does not
+  give false warnings.
 
-- Issue #7058: Added save/restore for argv and os.environ to runtest_inner
-  in regrtest, with warnings if the called test modifies them.
+- Issue #1628484: The Makefile doesn't ignore the CFLAGS environment variable
+  anymore.  It also forwards the LDFLAGS settings to the linker when building a
+  shared library.
 
-- Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6.
+- Issue #6716: Quote -x arguments of compileall in MSI installer.  Exclude 2to3
+  tests from compileall.
 
-C-API
------
+- Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9.
 
-- Make PyUnicode_CompareWithASCIIString return not equal if the Python string
-  has '\0' at the end.
+- Issue #7632: When Py_USING_MEMORY_DEBUGGER is defined, disable the private
+  memory allocation scheme in dtoa.c and use PyMem_Malloc and PyMem_Free
+  instead.  Also disable caching of powers of 5.
 
-- Issue #7414: 'C' code wasn't being skipped properly (for keyword arguments)
-  in PyArg_ParseTupleAndKeywords.
+- Issue #6491: Allow --with-dbmliborder to specify that no dbms will be built.
 
-Build
------
+- Issue #6943: Use pkg-config to find the libffi headers when the
+  --with-system-ffi flag is used.
 
-- Issue #9280: Make sharedinstall depend on sharedmods.
+- Issue #7609: Add a --with-system-expat option that causes the system's expat
+  library to be used for the pyexpat module instead of the one included with
+  Python.
 
-- Issue #8854: Fix finding Visual Studio 2008 on Windows x64.
+- Issue #7589: Only build the nis module when the correct header files are
+  found.
 
-- Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9.
+- Switch to OpenSSL 0.9.8l and sqlite 3.6.21 on Windows.
 
-- Issue #7632: When Py_USING_MEMORY_DEBUGGER is defined, disable the
-  private memory allocation scheme in dtoa.c and use PyMem_Malloc and
-  PyMem_Free instead.  Also disable caching of powers of 5.
+- Issue #5792: Extend the short float repr support to x86 systems using
+  icc or suncc.
 
-- Switch to OpenSSL 0.9.8l on Windows.
+- Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it compiles
+  correctly under gcc on x86-64.  This fixes a reported problem with the
+  --with-tsc build on x86-64.
 
-- Issue #6603: Change READ_TIMESTAMP macro in ceval.c so that it
-  compiles correctly under gcc on x86-64.  This fixes a reported
-  problem with the --with-tsc build on x86-64.
+- Issue #6802: Fix build issues on MacOSX 10.6.
 
-- Issue #6802: Fix build issues on MacOSX 10.6
+- Issue #6244: Allow detect_tkinter to look for Tcl/Tk 8.6.
+
+- Issue #4601: 'make install' did not set the appropriate permissions on
+  directories.
 
-- Issue #6801 : symmetric_difference_update also accepts |.
-  Thanks to Carl Chenet.
+- Issue #5390: Add uninstall icon independent of whether file extensions are
+  installed.
 
-- Issue #7541: when using ``python-config`` with a framework install the
+- Issue #7541: When using ``python-config`` with a framework install the
   compiler might use the wrong library.
 
-- Issue #6491: Allow --with-dbmliborder to specify that no dbms will be built.
+- python-config now supports multiple options on the same command line.
 
-- Issue #7589: Only build the nis module when the correct header files are
-  found.
+- Issue #8509: Fix quoting in help strings and code snippets in configure.in.
+
+- Issue #8510: Update to autoconf2.65.
 
 Documentation
 -------------
 
-- Updating `Using Python` documentation to include description of CPython's
-  -J and -X options.
+- Issue #9817: Add expat COPYING file; add expat, libffi and expat licenses
+  to Doc/license.rst.
+
+- Issue #9524: Document that two CTRL* signals are meant for use only
+  with os.kill.
+
+- Issue #9255: Document that the 'test' package is meant for internal Python use
+  only.
+
+- A small WSGI server was added as Tools/scripts/serve.py, and is used to
+  implement a local documentation server via 'make serve' in the doc directory.
+
+- Updating `Using Python` documentation to include description of CPython's -J
+  and -X options.
+
+- Document that importing a module that has None in sys.modules triggers an
+  ImportError.
 
-- Issue #6556: Fixed the Distutils configuration files location explanation
-  for Windows.
+- Issue #6556: Fixed the Distutils configuration files location explanation for
+  Windows.
 
 - Update python manual page (options -B, -O0, -s, environment variables
   PYTHONDONTWRITEBYTECODE, PYTHONNOUSERSITE).
@@ -1651,130 +3939,146 @@ Documentation
 - Issue #8909: Added the size of the bitmap used in the installer created by
   distutils' bdist_wininst. Patch by Anatoly Techtonik.
 
+Tests
+-----
 
-What's New in Python 3.1.1?
-===========================
+- Issue #9251: test_threaded_import didn't fail when run through regrtest if the
+  import lock was disabled.
 
-*Release date: 2009-08-13*
+- Issue #8605: Skip test_gdb if Python is compiled with optimizations.
 
-Core and Builtins
------------------
+- Issue #7449: Skip test_socketserver if threading support is disabled.
 
-- Issue #6707: dir() on an uninitialized module caused a crash.
+- Issue #8672: Add a zlib test ensuring that an incomplete stream can be handled
+  by a decompressor object without errors (it returns incomplete uncompressed
+  data).
 
-- Issue #6540: Fixed crash for bytearray.translate() with invalid parameters.
+- Issue #8533: regrtest uses backslashreplace error handler for stdout to avoid
+  UnicodeEncodeError (write non-ASCII character to stdout using ASCII encoding).
 
-- Issue #6573: set.union() stopped processing inputs if an instance of self
-  occurred in the argument chain.
+- Issue #8576: Remove use of find_unused_port() in test_smtplib and
+  test_multiprocessing.  Patch by Paul Moore.
 
-- Issue #6070: On posix platforms import no longer copies the execute bit
-  from the .py file to the .pyc file if it is set.
+- Issue #7449: Fix many tests to support Python compiled without thread
+  support. Patches written by Jerry Seutter.
 
-- Issue #6428: Since Python 3.0, the __bool__ method must return a bool
-  object, and not an int.  Fix the corresponding error message, and the
-  documentation.
+- Issue #8108: test_ftplib's non-blocking SSL server now has proper handling of
+  SSL shutdowns.
 
-- Issue #6347: Include inttypes.h as well as stdint.h in pyport.h.
-  This fixes a build failure on HP-UX: int32_t and uint32_t are
-  defined in inttypes.h instead of stdint.h on that platform.
+- Issues #8279, #8330, #8437, #8480, #8495: Fix test_gdb failures, patch written
+  by Dave Malcolm.
 
-- Issue #6373: Fixed a SystemError when encoding with the latin-1 codec and
-  the 'surrogateescape' error handler, a string which contains unpaired
-  surrogates.
+- Issue #3864: Skip three test_signal tests on freebsd6 because they fail if any
+  thread was previously started, most likely due to a platform bug.
 
-C-API
------
+- Issue #8193: Fix test_zlib failure with zlib 1.2.4.
 
-- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with
-  NUL: Bogus TypeError detail string.
+- Issue #8248: Add some tests for the bool type.  Patch by Gregory Nofi.
 
-- Issue #6405: Remove duplicate type declarations in descrobject.h.
+- Issue #8263: Now regrtest.py will report a failure if it receives a
+  KeyboardInterrupt (SIGINT).
 
-- The code flags for old __future__ features are now available again.
+- Issue #8180 and #8207: Fix test_pep277 on OS X and add more tests for special
+  Unicode normalization cases.
 
-Library
--------
+- Issue #7783: test.support.open_urlresource invalidates the outdated files from
+  the local cache.
 
-- Issue #6106: telnetlib.Telnet.process_rawq doesn't handle default WILL/WONT
-  DO/DONT correctly.
+- Issue #7849: Now the utility ``check_warnings`` verifies if the warnings are
+  effectively raised.
 
-- Issue #6126: Fixed pdb command-line usage.
+- The four path modules (genericpath, macpath, ntpath, posixpath) share a common
+  TestCase for some tests: test_genericpath.CommonTest.
 
-- Issue #6629: Fix a data corruption issue in the new I/O library, which could
-  occur when writing to a BufferedRandom object (e.g. a file opened in "rb+" or
-  "wb+" mode) after having buffered a certain amount of data for reading. This
-  bug was not present in the pure Python implementation.
+- Print platform information when running the whole test suite, or using the
+  --verbose flag.
 
-- Issue #6622: Fix "local variable 'secret' referenced before
-  assignment" bug in POP3.apop.
+- Issue #767675: enable test_pep277 on POSIX platforms with Unicode-friendly
+  filesystem encoding.
 
-- Issue #6637: defaultdict.copy() did not work when the default factory
-  was left unspecified.  Also, the eval/repr round-trip would fail when
-  the default_factory was None.
+- Issue #6292: for the moment at least, the test suite runs cleanly if python is
+  run with the -OO flag.  Tests requiring docstrings are skipped.
 
-- Issue #2715: Remove remnants of Carbon.File from binhex module.
+- Issue #7712: test.support gained a new `temp_cwd` context manager which is now
+  also used by regrtest to run all the tests in a temporary directory.  The
+  original CWD is saved in `support.SAVEDCWD`.  Thanks to Florent Xicluna who
+  helped with the patch.
 
-- Issue #6595: The Decimal constructor now allows arbitrary Unicode
-decimal digits in input, as recommended by the standard.  Previously
-it was restricted to accepting [0-9].
+- Issue #7924: Fix an intermittent 'XXX undetected error' failure in test_capi
+  (only seen so far on platforms where the curses module wasn't built), due to
+  an uncleared exception.
 
-- Issues #5155, #5313, #5331: multiprocessing.Process._bootstrap was
-unconditionally calling "os.close(sys.stdin.fileno())" resulting in file
-descriptor errors
+- Issue #7728: test_timeout was changed to use support.bind_port instead of a
+  hard coded port.
 
-- Issue #1424152: Fix for http.client, urllib.request to support SSL while
-working through proxy. Original patch by Christopher Li, changes made by
-Senthil Kumaran
+- Issue #7376: Instead of running a self-test (which was failing) when called
+  with no arguments, doctest.py now gives a usage message.
 
-- importlib.abc.PyLoader did not inherit from importlib.abc.ResourceLoader like
-the documentation said it did even though the code in PyLoader relied on the
-abstract method required by ResourceLoader.
+- Issue #7396: fix regrtest -s, which was broken by the -j enhancement.
 
-- Issue #6431: Make Fraction type return NotImplemented when it doesn't
-know how to handle a comparison without loss of precision.  Also add
-correct handling of infinities and nans for comparisons with float.
+- Issue #7498: test_multiprocessing now uses test.support.find_unused_port
+  instead of a hardcoded port number in test_rapid_restart.
 
-- Issue #6415: Fixed warnings.warn segfault on bad formatted string.
+- Issue #7431: Use TESTFN in test_linecache instead of trying to create a file
+  in the Lib/test directory, which might be read-only for the user running the
+  tests.
 
-- Issue #6358: The exit status of a command started with os.popen() was
-reported differently than it did with python 2.x.
+- Issue #7324: Add a sanity check to regrtest argument parsing to catch the case
+  of an option with no handler.
 
-- Issue #6323: The pdb debugger did not exit when running a script with a
-syntax error.
+- Issue #7312: Add a -F flag to run the selected tests in a loop until a test
+  fails.  Can be combined with -j.
 
-- Issue #3392: The subprocess communicate() method no longer fails in select()
-  when file descriptors are large; communicate() now uses poll() when possible.
+- Issue #6551: test_zipimport could import and then destroy some modules of the
+  encodings package, which would make other tests fail further down the road
+  because the internally cached encoders and decoders would point to empty
+  global variables.
 
-- Issue #6369: Fix an RLE decompression bug in the binhex module.
+- Issue #7295: Do not use a hardcoded file name in test_tarfile.
 
-- Issue #6344: Fixed a crash of mmap.read() when passed a negative argument.
+- Issue #7270: Add some dedicated unit tests for multi-thread synchronization
+  primitives such as Lock, RLock, Condition, Event and Semaphore.
 
-- Issue #4005: Fixed a crash of pydoc when there was a zip file present in
-  sys.path.
+- Issue #7248 (part 2): Use a unique temporary directory for importlib source
+  tests instead of tempfile.tempdir. This prevents the tests from sharing state
+  between concurrent executions on the same system.
 
-Extension Modules
------------------
+- Issue #7248: In importlib.test.source.util a try/finally block did not make
+  sure that some referenced objects actually were created in the block before
+  calling methods on the object.
 
-- Fix a segfault in expat.
+- Issue #7222: Make thread "reaping" more reliable so that reference
+  leak-chasing test runs give sensible results. The previous method of reaping
+  threads could return successfully while some Thread objects were still
+  referenced. This also introduces a new private function:
+  :func:`_thread._count()`.
 
-- Issue #4509: array.array objects are no longer modified after an operation
-  failing due to the resize restriction in-place when the object has exported
-  buffers.
+- Issue #7151: Fixed regrtest -j so that output to stderr from a test no longer
+  runs the risk of causing the worker thread to fail.
 
-Build
------
+- Issue #7055: test___all__ now greedily detects all modules which have an
+  __all__ attribute, rather than using a hardcoded and incomplete list.
 
-- Issue #4601: 'make install' did not set the appropriate permissions on
-directories.
+- Issue #7058: Added save/restore for things like sys.argv and cwd to
+  runtest_inner in regrtest, with warnings if the called test modifies them, and
+  a new section in the summary report at the end.
 
-- Issue #5390: Add uninstall icon independent of whether file
-extensions are installed.
+- Issue #7042: Fix test_signal (test_itimer_virtual) failure on OS X 10.6.
 
-Test
-----
+- Fixed tests in importlib.test.source.test_abc_loader that were masking the
+  proper exceptions that should be raised for missing or improper code object
+  bytecode.
 
-- Fix a test in importlib.test.source.test_abc_loader that was incorrectly
-testing when a .pyc file lacked an code object bytecode.
+- Removed importlib's custom test discovery code and switched to
+  unittest.TestLoader.discover().
+
+Tools/Demos
+-----------
+
+- Issue #5464, #8974: Implement plural forms in msgfmt.py.
+
+- iobench (a file I/O benchmark) and ccbench (a concurrency benchmark) were
+  added to the `Tools/` directory.  They were previously living in the sandbox.
 
 
 What's New in Python 3.1?
@@ -1786,27 +4090,28 @@ Core and Builtins
 -----------------
 
 - Issue #6334: Fix bug in range length calculation for ranges with
-large arguments.
+  large arguments.
 
 - Issue #6329: Fixed iteration for memoryview objects (it was being blocked
-because it wasn't recognized as a sequence).
+  because it wasn't recognized as a sequence).
 
 Library
 -------
 
-- Issue #6314: logging.basicConfig() performs extra checks on the "level"
-argument.
+- Issue #6126: Fixed pdb command-line usage.
+
+- Issue #6314: logging: performs extra checks on the "level" argument.
 
 - Issue #6274: Fixed possible file descriptors leak in subprocess.py
 
 - Accessing io.StringIO.buffer now raises an AttributeError instead of
-io.UnsupportedOperation.
+  io.UnsupportedOperation.
 
 - Issue #6271: mmap tried to close invalid file handle (-1) when anonymous.
-(On Unix)
+  (On Unix)
 
 - Issue #1202: zipfile module would cause a struct.error when attempting to
-store files with a CRC32 > 2**31-1.
+  store files with a CRC32 > 2**31-1.
 
 Extension Modules
 -----------------
@@ -1825,10 +4130,10 @@ Core and Builtins
 - Fixed SystemError triggered by "range([], 1, -1)".
 
 - Issue #5924: On Windows, a large PYTHONPATH environment variable
-(more than 255 characters) would be completely ignored.
+  (more than 255 characters) would be completely ignored.
 
 - Issue #4547: When debugging a very large function, it was not always
-possible to update the lineno attribute of the current frame.
+  possible to update the lineno attribute of the current frame.
 
 - Issue #5330: C functions called with keyword arguments were not reported by
   the various profiling modules (profile, cProfile). Patch by Hagen Fürstenau.
@@ -1837,38 +4142,38 @@ Library
 -------
 
 - Issue #6438: Fixed distutils.cygwinccompiler.get_versions : the regular
-expression string pattern was trying to match against a bytes returned by
-Popen. Tested under win32 to build the py-postgresql project.
+  expression string pattern was trying to match against a bytes returned by
+  Popen. Tested under win32 to build the py-postgresql project.
 
 - Issue #6258: Support AMD64 in bdist_msi.
 
 - Issue #6195: fixed doctest to no longer try to read 'source' data from
-binary files.
+  binary files.
 
 - Issue #5262: Fixed bug in next rollover time computation in
-TimedRotatingFileHandler.
+  TimedRotatingFileHandler.
 
 - Issue #6217: The C implementation of io.TextIOWrapper didn't include the
-errors property.  Additionally, the errors and encoding properties of StringIO
-are always None now.
+  errors property.  Additionally, the errors and encoding properties of StringIO
+  are always None now.
 
 - Issue #6137: The pickle module now translates module names when loading
-or dumping pickles with a 2.x-compatible protocol, in order to make data
-sharing and migration easier. This behaviour can be disabled using the
-new `fix_imports` optional argument.
+  or dumping pickles with a 2.x-compatible protocol, in order to make data
+  sharing and migration easier. This behaviour can be disabled using the
+  new `fix_imports` optional argument.
 
 - Removed the ipaddr module.
 
 - Issue #3613: base64.{encode,decode}string are now called
-base64.{encode,decode}bytes which reflects what type they accept and return.
-The old names are still there as deprecated aliases.
+  base64.{encode,decode}bytes which reflects what type they accept and return.
+  The old names are still there as deprecated aliases.
 
 - Issue #5767: Remove sgmlop support from xmlrpc.client.
 
 - Issue #6150: Fix test_unicode on wide-unicode builds.
 
 - Issue #6149: Fix initialization of WeakValueDictionary objects from non-empty
-parameters.
+  parameters.
 
 Windows
 -------
@@ -2151,7 +4456,7 @@ Core and Builtins
 - Issue #2170: refactored xml.dom.minidom.normalize, increasing both
   its clarity and its speed.
 
-- Issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add `do { ... } while (0)'
+- Issue #1113244: Py_XINCREF, Py_DECREF, Py_XDECREF: Add ``do { ... } while (0)``
   to avoid compiler warnings.
 
 - Issue #3739: The unicode-internal encoder now reports the number of characters
@@ -2165,6 +4470,8 @@ Installation
 Library
 -------
 
+- Issue #8203: Fix IDLE Credits dialog: view_file() uses its encoding argument.
+
 - Issue #5311: bdist_msi can now build packages that do not depend on a
   specific Python version.
 
@@ -2473,7 +4780,7 @@ Core and Builtins
   optional module state data.
 
 - Issue #4910: Rename nb_long slot to nb_reserved, and change its
-  type to (void *).
+  type to ``(void *)``.
 
 - Issue #4935: The overflow checking code in the expandtabs() method common
   to str, bytes and bytearray could be optimized away by the compiler, letting
@@ -2528,8 +4835,8 @@ Core and Builtins
 - Issue #4747: When the terminal does not use utf-8, executing a script with
   non-ascii characters in its name could fail with a "SyntaxError: None" error.
 
-- Issue #4797: IOError.filename was not set when _fileio.FileIO failed to open
-  file with `bytes' filename on Windows.
+- Issue #4797: IOError.filename was not set when ``_fileio.FileIO`` failed
+  to open file with a bytes filename on Windows.
 
 - Issue #3680: Reference cycles created through a dict, set or deque iterator
   did not get collected.
@@ -2596,23 +4903,65 @@ Core and Builtins
 Library
 -------
 
+- Issue #7071: byte-compilation in Distutils is now done with respect to
+  sys.dont_write_bytecode.
+
+- Issue #7066: archive_util.make_archive now restores the cwd if an error is
+  raised. Initial patch by Ezio Melotti.
+
+- Issue #6516: Added owner/group support when creating tar archives in
+  Distutils.
+
+- Issue #6954: Fixed crash when using DISTUTILS_DEBUG flag in Distutils.
+
+- Issue #6163: Fixed HP-UX runtime library dir options in
+  distutils.unixcompiler. Initial patch by Sridhar Ratnakumar and
+  Michael Haubenwallner.
+
+- Issue #6693: New functions in site.py to get user/global site packages paths.
+
+- Issue #6511: ZipFile now raises BadZipfile (instead of an IOError) when
+  opening an empty or very small file.
+
 - Issue #6545: Removed assert statements in distutils.Extension, so the
   behavior is similar when used with -O.
 
-- Issue #6459: distutils.command.build_ext.get_export_symbols now uses the
-  "PyInit" prefix, rather than "init".
+- unittest has been split up into a package.  All old names should still work.
+
+- Issue #6466: now distutils.cygwinccompiler and distutils.emxccompiler
+  uses the same refactored function to get gcc/ld/dllwrap versions numbers.
+  It's `distutils.util.get_compiler_versions`. Added deprecation warnings
+  for the obsolete get_versions() functions.
 
 - Issue #6433: fixed issues with multiprocessing.pool.map hanging on empty list
 
+- Issue #6314: logging: Extra checks on the "level" argument in more places.
+
+- Issue #2622: Fixed an ImportError when importing email.message from a
+  standalone application built with py2exe or py2app.
+
 - Issue #6455: Fixed test_build_ext under win32.
 
+- Issue #6377: Enabled the compiler option, and deprecate its usage as an
+  attribute.
+
 - Issue #6413: Fixed the log level in distutils.dist for announce.
 
 - Issue #6403: Fixed package path usage in build_ext.
 
+- Issues #5155, 5313, 5331: multiprocessing.Process._bootstrap was
+  unconditionally calling "os.close(sys.stdin.fileno())" resulting in file
+  descriptor errors
+
 - Issue #6365: Distutils build_ext inplace mode was copying the compiled
   extension in a subdirectory if the extension name had dots.
 
+- Issue #6164: Added an AIX specific linker argument in Distutils
+  unixcompiler. Original patch by Sridhar Ratnakumar.
+
+- Issue #6286: Now Distutils upload command is based on urllib2 instead of
+  httplib, allowing the usage of http_proxy.
+
 - Issue #6287: Added the license field in Distutils documentation.
 
 - Issue #6263: Fixed syntax error in distutils.cygwincompiler.
@@ -2738,7 +5087,7 @@ Library
 - Issue #5386: mmap.write_byte didn't check map size, so it could cause buffer
   overrun.
 
-- Issue #1533164: Installed but not listed *.pyo was breaking Distutils
+- Issue #1533164: Installed but not listed ``*.pyo`` was breaking Distutils
   bdist_rpm command.
 
 - Issue #5378: added --quiet option to Distutils bdist_rpm command.
@@ -2891,8 +5240,8 @@ Library
 - Issue #4959: inspect.formatargspec now works for keyword only arguments
   without defaults.
 
-- Issue #3321: _multiprocessing.Connection() doesn't check handle; added checks
-  for *nix machines for negative handles and large int handles. Without this check
+- Issue #3321: ``_multiprocessing.Connection()`` doesn't check handle; added checks
+  for Unix machines for negative handles and large int handles. Without this check
   it is possible to segfault the interpreter.
 
 - Issue #4449: AssertionError in mp_benchmarks.py, caused by an underlying issue
@@ -3098,6 +5447,9 @@ Build
 C-API
 -----
 
+- Issue #6624: yArg_ParseTuple with "s" format when parsing argument with
+  NUL: Bogus TypeError detail string.
+
 - Issue #5175: PyLong_AsUnsignedLongLong now raises OverflowError
   for negative arguments.  Previously, it raised TypeError.
 
@@ -3148,6 +5500,9 @@ Extension Modules
 Tests
 -----
 
+- Issue #6152: New option '-j'/'--multiprocess' for regrtest allows running
+  regression tests in parallel, shortening the total runtime.
+
 - Issue #5450: Moved tests involving loading tk from Lib/test/test_tcl to
   Lib/tkinter/test/test_tkinter/test_loadtk. With this, these tests demonstrate
   the same behaviour as test_ttkguionly (and now also test_tk) which is to
diff --git a/Misc/Porting b/Misc/Porting
index ec9cf1f441..51f73e63d1 100644
--- a/Misc/Porting
+++ b/Misc/Porting
@@ -31,7 +31,7 @@ target platform.  Forget about the posix module for now -- simply take
 it out of the config.c file.
 
 Bang on it until you get a >>> prompt.  (You may have to disable the
-importing of "site.py" by passing the -S options.)
+importing of "site.py" by passing the -S option.)
 
 Then bang on it until it executes very simple Python statements.
 
diff --git a/Misc/README b/Misc/README
index e7a59c7182..b239cee706 100644
--- a/Misc/README
+++ b/Misc/README
@@ -8,32 +8,19 @@ Files found here
 ----------------
 
 ACKS                    Acknowledgements
-AIX-NOTES               Notes for building Python on AIX
 build.sh                Script to build and test latest Python from the repository
-cheatsheet              Quick summary of Python by Ken Manheimer
-developers.txt          A history of who got developer permissions, and why
 gdbinit                 Handy stuff to put in your .gdbinit file, if you use gdb
 HISTORY                 News from previous releases -- oldest last
 indent.pro              GNU indent profile approximating my C style
-maintainers.rst         A list of maintainers for library modules
 NEWS                    News for this release (for some meaning of "this")
-NEWS.help               How to edit NEWS
 Porting                 Mini-FAQ on porting to new platforms
-PURIFY.README           Information for Purify users
-pymemcompat.h           Memory interface compatibility file.
 python-config.in        Python script template for python-config
 python.man              UNIX man page for the python interpreter
-python-mode.el          Emacs mode for editing Python programs
 python.pc.in            Package configuration info template for pkg-config
-python-wing.wpr         Wing IDE project file
+python-wing*.wpr        Wing IDE project file
 README                  The file you're reading now
-README.coverity         Information about running Coverity's Prevent on Python
-README.klocwork         Information about running Klocwork's K7 on Python
-README.OpenBSD          Help for building problems on OpenBSD
 README.valgrind         Information for Valgrind users, see valgrind-python.supp
-RFD                     Request For Discussion about a Python newsgroup
 RPM                     (Old) tools to build RPMs
-setuid-prog.c           C helper program for set-uid Python scripts
 SpecialBuilds.txt       Describes extra symbols you can set for debug builds
 TextMate                A TextMate bundle for Python development
 valgrind-python.supp    Valgrind suppression file, see README.valgrind
diff --git a/Misc/README.Emacs b/Misc/README.Emacs
deleted file mode 100644
index 68bb1dbd3f..0000000000
--- a/Misc/README.Emacs
+++ /dev/null
@@ -1,32 +0,0 @@
-=============
-Emacs support
-=============
-
-If you want to edit Python code in Emacs, you should download python-mode.el
-and install it somewhere on your load-path.  See the project page to download:
-
-    https://launchpad.net/python-mode
-
-While Emacs comes with a python.el file, it is not recommended.
-python-mode.el is maintained by core Python developers and is generally
-considered more Python programmer friendly.  For example, python-mode.el
-includes a killer feature called `pdbtrack` which allows you to set a pdb
-breakpoint in your code, run your program in an Emacs shell buffer, and do gud
-style debugging when the breakpoint is hit.
-
-python-mode.el is compatible with both GNU Emacs from the FSF, and XEmacs.
-
-For more information and bug reporting, see the above project page.  For help,
-development, or discussions, see the python-mode mailing list:
-
-    http://mail.python.org/mailman/listinfo/python-mode
-
-
-..
-   Local Variables:
-   mode: indented-text
-   indent-tabs-mode: nil
-   sentence-end-double-space: t
-   fill-column: 78
-   coding: utf-8
-   End:
diff --git a/Misc/README.OpenBSD b/Misc/README.OpenBSD
deleted file mode 100644
index b417ecc76f..0000000000
--- a/Misc/README.OpenBSD
+++ /dev/null
@@ -1,38 +0,0 @@
-
-2005-01-08
-
-If you are have a problem building on OpenBSD and see output like this
-while running configure:
-
-checking curses.h presence... yes
-configure: WARNING: curses.h: present but cannot be compiled
-configure: WARNING: curses.h: check for missing prerequisite headers?
-configure: WARNING: curses.h: see the Autoconf documentation
-configure: WARNING: curses.h: section "Present But Cannot Be Compiled"
-configure: WARNING: curses.h: proceeding with the preprocessor's result
-configure: WARNING: curses.h: in the future, the compiler will take precedence
-
-there is likely a problem that will prevent building python.  
-If you see the messages above and are able to completely build python,
-please tell python-dev@python.org indicating your version of OpenBSD
-and any other relevant system configuration.
-
-The build error that occurs while making may look something like this:
-
-    /usr/include/sys/event.h:53: error: syntax error before "u_int"
-    /usr/include/sys/event.h:55: error: syntax error before "u_short"
-
-To fix this problem, you will probably need update Python's configure
-script to disable certain options.  Search for a line that looks like:
-
-    OpenBSD/2.* | OpenBSD/3.@<:@012345678@:>@)
-
-If your version is not in that list, e.g., 3.9, add the version
-number.  In this case, you would just need to add a 9 after the 8.
-If you modify configure.in, you will need to regenerate configure
-with autoconf.
-
-If your version is already in the list, this is not a known problem.
-Please submit a bug report here:
-
-    http://sourceforge.net/tracker/?group_id=5470&atid=105470
diff --git a/Misc/README.klocwork b/Misc/README.klocwork
deleted file mode 100644
index 6d2f57fc73..0000000000
--- a/Misc/README.klocwork
+++ /dev/null
@@ -1,30 +0,0 @@
-
-Klocwork has a static analysis tool (K7) which is similar to Coverity.
-They will run their tool on the Python source code on demand.
-The results are available at:
-
-     https://opensource.klocwork.com/
-
-Currently, only Neal Norwitz has access to the analysis reports.  Other
-people can be added by request.
-
-K7 was first run on the Python 2.5 source code in mid-July 2006.
-This is after Coverity had been making their results available.
-There were originally 175 defects reported.  Most of these
-were false positives.  However, there were numerous real issues 
-also uncovered.
-
-Each warning has a unique id and comments that can be made on it.
-When checking in changes due to a K7 report, the unique id
-as reported by the tool was added to the SVN commit message.
-A comment was added to the K7 warning indicating the SVN revision
-in addition to any analysis.
-
-False positives were also annotated so that the comments can
-be reviewed and reversed if the analysis was incorrect.
-
-A second run was performed on 10-Aug-2006.  The tool was tuned to remove
-some false positives and perform some additional checks.  ~150 new
-warnings were produced, primarily related to dereferencing NULL pointers.
-
-Contact python-dev@python.org for more information.
diff --git a/Misc/RFD b/Misc/RFD
deleted file mode 100644
index fd278c4fa5..0000000000
--- a/Misc/RFD
+++ /dev/null
@@ -1,114 +0,0 @@
-To:  python-list
-Subject: comp.lang.python RFD again
-From: Guido.van.Rossum@cwi.nl
-
-I've followed the recent discussion and trimmed the blurb RFD down a bit
-(and added the word "object-oriented" to the blurb).
-
-I don't think it's too early to *try* to create the newsgroup --
-whether we will succeed may depend on how many Python supporters there
-are outside the mailing list.
-
-I'm personally not worried about moderation, and anyway I haven't
-heard from any volunteers for moderation (and I won't volunteer
-myself) so I suggest that we'll continue to ask for one unmoderated
-newsgroup.
-
-My next action will be to post an updated FAQ (which will hint at the
-upcoming RFD) to comp.lang.misc; then finalize the 1.0.0 release and
-put it on the ftp site.  I'll also try to get it into
-comp.sources.unix or .misc.  And all this before the end of January!
-
---Guido van Rossum, CWI, Amsterdam <Guido.van.Rossum@cwi.nl>
-URL:  <http://www.cwi.nl/cwi/people/Guido.van.Rossum.html>
-
-======================================================================
-
-These are the steps required (in case you don't know about the
-newsgroup creation process):
-
-First, we need to draw up an RFD (Request For Discussion).  This is a
-document that tells what the purpose of the group is, and gives a case
-for its creation.  We post this to relevant groups (comp.lang.misc,
-the mailing list, news.groups, etc.)  Discussion is held on
-news.groups.
-
-Then, after a few weeks, we run the official CFV (Call For Votes).
-The votes are then collected over a period of weeks.  We need 100 more
-yes votes than no votes, and a 2/3 majority, to get the group.
-
-There are some restrictions on the vote taker: [s]he cannot actively
-campaign for/against the group during the vote process.  So the main
-benefit to Steve instead of me running the vote is that I will be free
-to campaign for its creation!
-
-The following is our current draft for the RFD.
-
-======================================================================
-
-Request For Discussion: comp.lang.python
-
-
-Purpose
--------
-
-The newsgroup will be for discussion on the Python computer language.
-Possible topics include requests for information, general programming,
-development, and bug reports. The group will be unmoderated.
-
-
-What is Python?
----------------
-
-Python is a relatively new very-high-level language developed in
-Amsterdam.  Python is a simple, object-oriented procedural language,
-with features taken from ABC, Icon, Modula-3, and C/C++.
-
-Its central goal is to provide the best of both worlds: the dynamic
-nature of scripting languages like Perl/TCL/REXX, but also support for
-general programming found in the more traditional languages like Icon,
-C, Modula,...
-
-Python may be FTP'd from the following sites:
-
-	ftp.cwi.nl in directory /pub/python (its "home site", also has a FAQ)
-	ftp.uu.net in directory /languages/python
-	gatekeeper.dec.com in directory /pub/plan/python/cwi
-
-
-Rationale
----------
-
-Currently there is a mailing list with over 130 subscribers.
-The activity of this list is high, and to make handling the
-traffic more reasonable, a newsgroup is being proposed. We
-also feel that comp.lang.misc would not be a suitable forum
-for this volume of discussion on a particular language.
-
-
-Charter
--------
-
-Comp.lang.python is an unmoderated newsgroup which will serve
-as a forum for discussing the Python computer language. The
-group will serve both those who just program in Python and
-those who work on developing the language. Topics that
-may be discussed include:
-
-	- announcements of new versions of the language and
-	  applications written in Python.
-
-	- discussion on the internals of the Python language.
-
-	- general information about the language.
-
-	- discussion on programming in Python.
-
-
-Discussion
-----------
-
-Any objections to this RFD will be considered and, if determined
-to be appropriate, will be incorporated. The discussion period
-will be for a period of 21 days after which the first CFV will be
-issued.
diff --git a/Misc/RPM/README b/Misc/RPM/README
index f3a25575f7..d883c95e85 100644
--- a/Misc/RPM/README
+++ b/Misc/RPM/README
@@ -2,11 +2,6 @@ This directory contains support file used to build RPM releases of
 Python.  Its contents are maintained by Sean Reifschneider
 <jafo@tummy.com>.
 
-It is recommended that RPM builders use the python*.src.rpm file
-downloaded from the "ftp.python.org:/pub/python/<version>/rpms".  These
-may be more up to date than the files included in the base Python
-release tar-file.
-
 If you wish to build RPMs from the base Python release tar-file, note
 that you will have to download the
 "doc/<version>/html-<version>.tar.bz2"
@@ -14,3 +9,25 @@ file from python.org and place it into your "SOURCES" directory for
 the build to complete.  This is the same directory that you place the
 Python-2.3.1 release tar-file in.  You can then use the ".spec" file in
 this directory to build RPMs.
+
+You may also wish to pursue RPMs provided by distribution makers to see if
+they have one suitable for your uses.  If, for example, you just want a
+slightly newer version of Python than what the distro provides, you could
+pick up the closest SRPM your distro provides, and then modify it to
+the newer version, and build that.  It may be as simple as just changing
+the "version" information in the spec file (or it may require fixing
+patches).
+
+NOTE: I am *NOT* recommending just using the binary RPM, and never do an
+install with "--force" or "--nodeps".
+
+Also worth pursuing may be newer versions provided by similar distros.  For
+example, a Python 3 SRPM from Fedora may be a good baseline to try building
+on CentOS.
+
+Many newer SRPMs won't install on older distros because of format changes.
+You can manually extract these SRPMS with:
+
+   mkdir foo
+   cd foo
+   rpm2cpio <../python3-*.src.rpm | cpio -ivd
diff --git a/Misc/RPM/python-3.1.spec b/Misc/RPM/python-3.2.spec
index 0f24a41762..a5ecdc703a 100644
--- a/Misc/RPM/python-3.1.spec
+++ b/Misc/RPM/python-3.2.spec
@@ -25,6 +25,11 @@
 %define config_ipv6 yes
 %define config_ipv6 no
 
+#  Build shared libraries or .a library?
+#WARNING: Commenting out doesn't work.  Last line is what's used.
+%define config_sharedlib no
+%define config_sharedlib yes
+
 #  Location of the HTML directory.
 %define config_htmldir /var/www/html/python
 
@@ -34,8 +39,8 @@
 
 %define name python
 #--start constants--
-%define version 3.1.3
-%define libvers 3.1
+%define version 3.2
+%define libvers 3.2
 #--end constants--
 %define release 1pydotorg
 %define __prefix /usr
@@ -46,6 +51,8 @@
 %define binsuffix %(if [ "%{config_binsuffix}" = none ]; then echo ; else echo "%{config_binsuffix}"; fi)
 %define include_tkinter %(if [ \\( "%{config_tkinter}" = auto -a -f /usr/bin/wish \\) -o "%{config_tkinter}" = yes ]; then echo 1; else echo 0; fi)
 %define libdirname %(( uname -m | egrep -q '_64$' && [ -d /usr/lib64 ] && echo lib64 ) || echo lib)
+%define sharedlib %(if [ "%{config_sharedlib}" = yes ]; then echo --enable-shared; else echo ; fi)
+%define include_sharedlib %(if [ "%{config_sharedlib}" = yes ]; then echo 1; else echo 0; fi)
 
 #  detect if documentation is available
 %define include_docs %(if [ -f "%{_sourcedir}/html-%{version}.tar.bz2" ]; then echo 1; else echo 0; fi)
@@ -223,7 +230,14 @@ formats.
 #  BUILD
 ########
 %build
-./configure --enable-unicode=ucs4 %{ipv6} %{pymalloc} --prefix=%{__prefix}
+echo "Setting for ipv6: %{ipv6}"
+echo "Setting for pymalloc: %{pymalloc}"
+echo "Setting for binsuffix: %{binsuffix}"
+echo "Setting for include_tkinter: %{include_tkinter}"
+echo "Setting for libdirname: %{libdirname}"
+echo "Setting for sharedlib: %{sharedlib}"
+echo "Setting for include_sharedlib: %{include_sharedlib}"
+./configure --enable-unicode=ucs4 %{sharedlib} %{ipv6} %{pymalloc} --prefix=%{__prefix}
 make
 
 ##########
@@ -254,11 +268,10 @@ fi
 #  add the binsuffix
 if [ ! -z "%{binsuffix}" ]
 then
-   ( cd $RPM_BUILD_ROOT%{__prefix}/bin; rm -f python[0-9a-zA-Z]*;
-         mv -f python python"%{binsuffix}" )
-   ( cd $RPM_BUILD_ROOT%{__prefix}/share/man/man1; mv python.1 python%{binsuffix}.1 )
-   ( cd $RPM_BUILD_ROOT%{__prefix}/bin; mv -f pydoc pydoc"%{binsuffix}" )
-   ( cd $RPM_BUILD_ROOT%{__prefix}/bin; mv -f idle idle"%{binsuffix}" )
+   rm -f $RPM_BUILD_ROOT%{__prefix}/bin/python[0-9a-zA-Z]*
+   ( cd $RPM_BUILD_ROOT%{__prefix}/bin; 
+      for file in *; do mv "$file" "$file"%{binsuffix}; done )
+   ( cd $RPM_BUILD_ROOT%{_mandir}/man1; mv python.1 python%{binsuffix}.1 )
 fi
 
 ########
@@ -273,17 +286,23 @@ cp -a Tools $RPM_BUILD_ROOT%{__prefix}/%{libdirname}/python%{libvers}
 
 #  MAKE FILE LISTS
 rm -f mainpkg.files
-find "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/lib-dynload -type f |
+find "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers} -type f |
 	sed "s|^${RPM_BUILD_ROOT}|/|" |
-	grep -v -e '_tkinter.so$' >mainpkg.files
-find "$RPM_BUILD_ROOT""%{__prefix}"/bin -type f |
+	grep -v -e '/python%{libvers}/config$' -e '_tkinter.so$' >mainpkg.files
+find "$RPM_BUILD_ROOT""%{__prefix}"/bin -type f -o -type l |
 	sed "s|^${RPM_BUILD_ROOT}|/|" |
+	grep -v -e '/bin/2to3%{binsuffix}$' |
+	grep -v -e '/bin/pydoc%{binsuffix}$' |
+	grep -v -e '/bin/smtpd.py%{binsuffix}$' |
 	grep -v -e '/bin/idle%{binsuffix}$' >>mainpkg.files
 
 rm -f tools.files
 find "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/idlelib \
       "$RPM_BUILD_ROOT""%{__prefix}"/%{libdirname}/python%{libvers}/Tools -type f |
       sed "s|^${RPM_BUILD_ROOT}|/|" >tools.files
+echo "%{__prefix}"/bin/2to3%{binsuffix} >>tools.files
+echo "%{__prefix}"/bin/pydoc%{binsuffix} >>tools.files
+echo "%{__prefix}"/bin/smtpd.py%{binsuffix} >>tools.files
 echo "%{__prefix}"/bin/idle%{binsuffix} >>tools.files
 
 ######
@@ -341,27 +360,13 @@ rm -f mainpkg.files tools.files
 %defattr(-,root,root)
 %doc Misc/README Misc/cheatsheet Misc/Porting
 %doc LICENSE Misc/ACKS Misc/HISTORY Misc/NEWS
-%{__prefix}/share/man/man1/python%{binsuffix}.1*
+%{_mandir}/man1/python%{binsuffix}.1*
 
 %attr(755,root,root) %dir %{__prefix}/include/python%{libvers}
 %attr(755,root,root) %dir %{__prefix}/%{libdirname}/python%{libvers}/
-%{__prefix}/%{libdirname}/python%{libvers}/*.txt
-%{__prefix}/%{libdirname}/python%{libvers}/*.py*
-%{__prefix}/%{libdirname}/python%{libvers}/pdb.doc
-%{__prefix}/%{libdirname}/python%{libvers}/curses
-%{__prefix}/%{libdirname}/python%{libvers}/distutils
-%{__prefix}/%{libdirname}/python%{libvers}/encodings
-%{__prefix}/%{libdirname}/python%{libvers}/plat-linux2
-%{__prefix}/%{libdirname}/python%{libvers}/site-packages
-%{__prefix}/%{libdirname}/python%{libvers}/test
-%{__prefix}/%{libdirname}/python%{libvers}/xml
-%{__prefix}/%{libdirname}/python%{libvers}/email
-%{__prefix}/%{libdirname}/python%{libvers}/email/mime
-%{__prefix}/%{libdirname}/python%{libvers}/sqlite3
-%{__prefix}/%{libdirname}/python%{libvers}/compiler
-%{__prefix}/%{libdirname}/python%{libvers}/hotshot
-%{__prefix}/%{libdirname}/python%{libvers}/logging
-%{__prefix}/%{libdirname}/python%{libvers}/lib-old
+%if %{include_sharedlib}
+%{__prefix}/%{libdirname}/libpython*
+%endif
 
 %files devel
 %defattr(-,root,root)
diff --git a/Misc/Vim/vimrc b/Misc/Vim/vimrc
index 2013bf30e6..c398cca696 100644
--- a/Misc/Vim/vimrc
+++ b/Misc/Vim/vimrc
@@ -15,38 +15,35 @@
 " Only basic settings needed to enforce the style guidelines are set.
 " Some suggested options are listed but commented out at the end of this file.
 
-
-" Number of spaces to use for an indent.
-" This will affect Ctrl-T and 'autoindent'.
-" Python: 4 spaces
-" C: 4 spaces
-au BufRead,BufNewFile *.py,*pyw set shiftwidth=4
-au BufRead *.c,*.h set shiftwidth=8
-au BufNewFile *.c,*.h set shiftwidth=4
-
 " Number of spaces that a pre-existing tab is equal to.
 " For the amount of space used for a new tab use shiftwidth.
-" Python: 8
-" C: 8
 au BufRead,BufNewFile *py,*pyw,*.c,*.h set tabstop=8
 
-" Replace tabs with the equivalent number of spaces.
-" Also have an autocmd for Makefiles since they require hard tabs.
-" Python: yes
-" C: yes
-" Makefile: no
-au BufRead,BufNewFile *.py,*.pyw,*.c,*.h set expandtab
+" What to use for an indent.
+" This will affect Ctrl-T and 'autoindent'.
+" Python: 4 spaces
+" C: tabs (pre-existing files) or 4 spaces (new files)
+au BufRead,BufNewFile *.py,*pyw set shiftwidth=4
+au BufRead,BufNewFile *.py,*.pyw set expandtab
+fu Select_c_style()
+    if search('^\t', 'n', 150)
+        set shiftwidth=8
+        set noexpandtab
+    el 
+        set shiftwidth=4
+        set expandtab
+    en
+endf
+au BufRead,BufNewFile *.c,*.h call Select_c_style()
 au BufRead,BufNewFile Makefile* set noexpandtab
 
-" Use the below highlight group when displaying bad whitespace is desired
+" Use the below highlight group when displaying bad whitespace is desired.
 highlight BadWhitespace ctermbg=red guibg=red
 
 " Display tabs at the beginning of a line in Python mode as bad.
-" Should be done for C code, but not until all code has been moved to 4-space
-"   indents.
 au BufRead,BufNewFile *.py,*.pyw match BadWhitespace /^\t\+/
 " Make trailing whitespace be flagged as bad.
-au BufRead,BufNewFile *.py,*.pyw,*.c,*.h match BadWhitespace /\s\+$/
+au BufRead,BufNewFile *.py,*.pyw,*.c,*.h,*.rst match BadWhitespace /\s\+$/
 
 " Wrap text after a certain number of characters
 " Python: 79 
diff --git a/Misc/build.sh b/Misc/build.sh
index 03c0d7b43e..ecbe57970f 100755
--- a/Misc/build.sh
+++ b/Misc/build.sh
@@ -52,9 +52,9 @@ FAILURE_MAILTO="python-checkins@python.org"
 #FAILURE_CC="optional--uncomment and set to desired address"
 
 REMOTE_SYSTEM="neal@dinsdale.python.org"
-REMOTE_DIR="/data/ftp.python.org/pub/www.python.org/doc/3.1"
+REMOTE_DIR="/data/ftp.python.org/pub/docs.python.org/dev/py3k"
 RESULT_FILE="$DIR/build/index.html"
-INSTALL_DIR="/tmp/python-test-3.1/local"
+INSTALL_DIR="/tmp/python-test-3.2/local"
 RSYNC_OPTS="-C -e ssh -rlogD"
 
 # Always run the installed version of Python.
@@ -214,7 +214,7 @@ if [ $err = 0 -a "$BUILD_DISABLED" != "yes" ]; then
             ## make and run basic tests
             F=make-test.out
             start=`current_time`
-            $PYTHON $REGRTEST_ARGS -u urlfetch >& build/$F
+            $PYTHON $REGRTEST_ARGS -W -u urlfetch >& build/$F
             NUM_FAILURES=`count_failures build/$F`
             place_summary_first build/$F
             update_status "Testing basics ($NUM_FAILURES failures)" "$F" $start
@@ -222,7 +222,7 @@ if [ $err = 0 -a "$BUILD_DISABLED" != "yes" ]; then
 
             F=make-test-opt.out
             start=`current_time`
-            $PYTHON -O $REGRTEST_ARGS -u urlfetch >& build/$F
+            $PYTHON -O $REGRTEST_ARGS -W -u urlfetch >& build/$F
             NUM_FAILURES=`count_failures build/$F`
             place_summary_first build/$F
             update_status "Testing opt ($NUM_FAILURES failures)" "$F" $start
@@ -245,7 +245,7 @@ if [ $err = 0 -a "$BUILD_DISABLED" != "yes" ]; then
             start=`current_time`
             ## skip curses when running from cron since there's no terminal
             ## skip sound since it's not setup on the PSF box (/dev/dsp)
-            $PYTHON $REGRTEST_ARGS -uall -x test_curses test_linuxaudiodev test_ossaudiodev $_ALWAYS_SKIP >& build/$F
+            $PYTHON $REGRTEST_ARGS -W -uall -x test_curses test_linuxaudiodev test_ossaudiodev &_ALWAYS_SKIP >& build/$F
             NUM_FAILURES=`count_failures build/$F`
             place_summary_first build/$F
             update_status "Testing all except curses and sound ($NUM_FAILURES failures)" "$F" $start
diff --git a/Misc/cheatsheet b/Misc/cheatsheet
deleted file mode 100644
index 8c5ddcb457..0000000000
--- a/Misc/cheatsheet
+++ /dev/null
@@ -1,2181 +0,0 @@
-                          Python 2.3 Quick Reference
-
-
- 25 Jan 2003  upgraded by Raymond Hettinger for Python 2.3
- 16 May 2001  upgraded by Richard Gruet and Simon Brunning for Python 2.0
- 2000/07/18  upgraded by Richard Gruet, rgruet@intraware.com for Python 1.5.2
-from V1.3 ref
-1995/10/30, by Chris Hoffmann, choffman@vicorp.com
-
-Based on:
-    Python Bestiary, Author: Ken Manheimer, ken.manheimer@nist.gov
-    Python manuals, Authors: Guido van Rossum and Fred Drake
-    What's new in Python 2.0, Authors: A.M. Kuchling and Moshe Zadka
-    python-mode.el, Author: Tim Peters, tim_one@email.msn.com
-
-    and the readers of comp.lang.python
-
-Python's nest: http://www.python.org     Developement: http://
-python.sourceforge.net/    ActivePython : http://www.ActiveState.com/ASPN/
-Python/
-newsgroup: comp.lang.python  Help desk: help@python.org
-Resources: http://starship.python.net/
-           http://www.vex.net/parnassus/
-           http://aspn.activestate.com/ASPN/Cookbook/Python
-FAQ:       http://www.python.org/cgi-bin/faqw.py
-Full documentation: http://www.python.org/doc/
-Excellent reference books:
-           Python Essential Reference by David Beazley (New Riders)
-           Python Pocket Reference by Mark Lutz (O'Reilly)
-
-
-Invocation Options
-
-python [-diOStuUvxX?] [-c command | script | - ] [args]
-
-                              Invocation Options
-Option                                  Effect
--c cmd  program passed in as string (terminates option list)
--d      Outputs parser debugging information (also PYTHONDEBUG=x)
--E      ignore environment variables (such as PYTHONPATH)
--h      print this help message and exit
--i      Inspect interactively after running script (also PYTHONINSPECT=x) and
-        force prompts, even if stdin appears not to be a terminal
--m mod  run library module as a script (terminates option list
--O      optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)
--OO     remove doc-strings in addition to the -O optimizations
--Q arg  division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew
--S      Don't perform 'import site' on initialization
--u      Unbuffered binary stdout and stderr (also PYTHONUNBUFFERED=x).
--v      Verbose (trace import statements) (also PYTHONVERBOSE=x)
--W arg : warning control (arg is action:message:category:module:lineno)
--x      Skip first line of source, allowing use of non-unix Forms of #!cmd
--?      Help!
--c      Specify the command to execute (see next section). This terminates the
-command option list (following options are passed as arguments to the command).
-        the name of a python file (.py) to execute read from stdin.
-script  Anything afterward is passed as options to python script or command,
-        not interpreted as an option to interpreter itself.
-args    passed to script or command (in sys.argv[1:])
-        If no script or command, Python enters interactive mode.
-
-  * Available IDEs in std distrib: IDLE (tkinter based, portable), Pythonwin
-    (Windows).
-
-
-
-Environment variables
-
-                             Environment variables
-    Variable                                 Effect
-PYTHONHOME       Alternate prefix directory (or prefix;exec_prefix). The
-                 default module search path uses prefix/lib
-                 Augments the default search path for module files. The format
-                 is the same as the shell's $PATH: one or more directory
-                 pathnames separated by ':' or ';' without spaces around
-                 (semi-)colons!
-PYTHONPATH       On Windows first search for Registry key HKEY_LOCAL_MACHINE\
-                 Software\Python\PythonCore\x.y\PythonPath (default value). You
-                 may also define a key named after your application with a
-                 default string value giving the root directory path of your
-                 app.
-                 If this is the name of a readable file, the Python commands in
-PYTHONSTARTUP    that file are executed before the first prompt is displayed in
-                 interactive mode (no default).
-PYTHONDEBUG      If non-empty, same as -d option
-PYTHONINSPECT    If non-empty, same as -i option
-PYTHONSUPPRESS   If non-empty, same as -s option
-PYTHONUNBUFFERED If non-empty, same as -u option
-PYTHONVERBOSE    If non-empty, same as -v option
-PYTHONCASEOK     If non-empty, ignore case in file/module names (imports)
-
-
-
-
-Notable lexical entities
-
-Keywords
-
-    and       del       for       is        raise
-    assert    elif      from      lambda    return
-    break     else      global    not       try
-    class     except    if        or        while
-    continue  exec      import    pass      yield
-    def       finally   in        print
-
-  * (list of keywords in std module: keyword)
-  * Illegitimate Tokens (only valid in strings): @ $ ?
-  * A statement must all be on a single line. To break a statement over
-    multiple lines use "\", as with the C preprocessor.
-    Exception: can always break when inside any (), [], or {} pair, or in
-    triple-quoted strings.
-  * More than one statement can appear on a line if they are separated with
-    semicolons (";").
-  * Comments start with "#" and continue to end of line.
-
-Identifiers
-
-        (letter | "_")  (letter | digit | "_")*
-
-  * Python identifiers keywords, attributes, etc. are case-sensitive.
-  * Special forms: _ident (not imported by 'from module import *'); __ident__
-    (system defined name);
-               __ident (class-private name mangling)
-
-Strings
-
-    "a string enclosed by double quotes"
-    'another string delimited by single quotes and with a " inside'
-    '''a string containing embedded newlines and quote (') marks, can be
-    delimited with triple quotes.'''
-    """ may also use 3- double quotes as delimiters """
-    u'a unicode string'   U"Another unicode string"
-    r'a raw string where \ are kept (literalized): handy for regular
-    expressions and windows paths!'
-    R"another raw string"    -- raw strings cannot end with a \
-    ur'a unicode raw string'   UR"another raw unicode"
-
-        Use \ at end of line to continue a string on next line.
-        adjacent strings are concatened, e.g. 'Monty' ' Python' is the same as
-        'Monty Python'.
-        u'hello' + ' world'  --> u'hello world'   (coerced to unicode)
-
-    String Literal Escapes
-
-     \newline  Ignored (escape newline)
-     \\ Backslash (\)        \e Escape (ESC)        \v Vertical Tab (VT)
-     \' Single quote (')     \f Formfeed (FF)       \OOO char with octal value OOO
-     \" Double quote (")     \n Linefeed (LF)
-     \a Bell (BEL)           \r Carriage Return (CR) \xHH  char with hex value HH
-     \b Backspace (BS)       \t Horizontal Tab (TAB)
-     \uHHHH  unicode char with hex value HHHH, can only be used in unicode string
-     \UHHHHHHHH  unicode char with hex value HHHHHHHH, can only be used in unicode string
-     \AnyOtherChar is left as-is
-
-  * NUL byte (\000) is NOT an end-of-string marker; NULs may be embedded in
-    strings.
-  * Strings (and tuples) are immutable: they cannot be modified.
-
-Numbers
-
-    Decimal integer: 1234, 1234567890546378940L        (or l)
-    Octal integer: 0177, 0177777777777777777 (begin with a 0)
-    Hex integer: 0xFF, 0XFFFFffffFFFFFFFFFF (begin with 0x or 0X)
-    Long integer (unlimited precision): 1234567890123456
-    Float (double precision): 3.14e-10, .001, 10., 1E3
-    Complex: 1J, 2+3J, 4+5j (ends with J or j, + separates (float) real and
-    imaginary parts)
-
-Sequences
-
-  * String of length 0, 1, 2 (see above)
-    '', '1', "12", 'hello\n'
-  * Tuple of length 0, 1, 2, etc:
-    () (1,) (1,2)     # parentheses are optional if len > 0
-  * List of length 0, 1, 2, etc:
-    [] [1] [1,2]
-
-Indexing is 0-based. Negative indices (usually) mean count backwards from end
-of sequence.
-
-Sequence slicing [starting-at-index : but-less-than-index]. Start defaults to
-'0'; End defaults to 'sequence-length'.
-
-a = (0,1,2,3,4,5,6,7)
-    a[3] ==> 3
-    a[-1] ==> 7
-    a[2:4] ==> (2, 3)
-    a[1:] ==> (1, 2, 3, 4, 5, 6, 7)
-    a[:3] ==> (0, 1, 2)
-    a[:] ==> (0,1,2,3,4,5,6,7)  # makes a copy of the sequence.
-
-Dictionaries (Mappings)
-
-    {}                              # Zero length empty dictionary
-    {1 : 'first'}                   # Dictionary with one (key, value) pair
-    {1 : 'first',  'next': 'second'}
-    dict([('one',1),('two',2)])     # Construct a dict from an item list
-    dict('one'=1, 'two'=2)          # Construct a dict using keyword args
-    dict.fromkeys(['one', 'keys'])  # Construct a dict from a sequence
-
-Operators and their evaluation order
-
-                     Operators and their evaluation order
-Highest             Operator                             Comment
-        (...) [...] {...} `...`           Tuple, list & dict. creation; string
-                                          conv.
-        s[i]  s[i:j]  s.attr f(...)       indexing & slicing; attributes, fct
-                                          calls
-        +x, -x, ~x                        Unary operators
-        x**y                              Power
-        x*y  x/y  x%y x//y                mult, division, modulo, floor division
-        x+y  x-y                          addition, subtraction
-        x<<y   x>>y                       Bit shifting
-        x&y                               Bitwise and
-        x^y                               Bitwise exclusive or
-        x|y                               Bitwise or
-        x<y  x<=y  x>y  x>=y  x==y x!=y   Comparison,
-        x is y   x is not y               membership
-        x in s   x not in s
-        not x                             boolean negation
-        x and y                           boolean and
-        x or y                            boolean or
-Lowest  lambda args: expr                 anonymous function
-
-Alternate names are defined in module operator (e.g. __add__ and add for +)
-Most operators are overridable.
-
-Many binary operators also support augmented assignment:
-        x += 1                            # Same as x = x + 1
-
-
-Basic Types and Their Operations
-
-Comparisons (defined between *any* types)
-
-               Comparisons
-Comparison         Meaning          Notes
-<          strictly less than        (1)
-<=         less than or equal to
->          strictly greater than
->=         greater than or equal to
-==         equal to
-!=         not equal to
-is         object identity           (2)
-is not     negated object identity   (2)
-
-Notes :
-    Comparison behavior can be overridden for a given class by defining special
-method __cmp__.
-    The above comparisons return True or False which are of type bool
-(a subclass of int) and behave exactly as 1 or 0 except for their type and
-that they print as True or False instead of 1 or 0.
-    (1) X < Y < Z < W has expected meaning, unlike C
-    (2) Compare object identities (i.e. id(object)), not object values.
-
-Boolean values and operators
-
-                         Boolean values and operators
-              Value or Operator                         Returns           Notes
-None, numeric zeros, empty sequences and      False
-mappings
-all other values                              True
-not x                                         True if x is False, else
-                                              True
-x or y                                        if x is False then y, else   (1)
-                                              x
-x and y                                       if x is False then x, else   (1)
-                                              y
-
-Notes :
-    Truth testing behavior can be overridden for a given class by defining
-special method __bool__.
-    (1) Evaluate second arg only if necessary to determine outcome.
-
-None
-
-    None is used as default return value on functions. Built-in single object
-    with type NoneType.
-    Input that evaluates to None does not print when running Python
-    interactively.
-
-Numeric types
-
-Floats and integers.
-
-    Floats are implemented with C doubles.
-    Integers have unlimited size (only limit is system resources)
-
-Operators on all numeric types
-
-           Operators on all numeric types
- Operation                    Result
-abs(x)       the absolute value of x
-int(x)       x converted to integer
-float(x)     x converted to floating point
--x           x negated
-+x           x unchanged
-x + y        the sum of x and y
-x - y        difference of x and y
-x * y        product of x and y
-x / y        quotient of x and y
-x % y        remainder of x / y
-divmod(x, y) the tuple (x/y, x%y)
-x ** y       x to the power y (the same as pow(x, y))
-
-Bit operators on integers
-
-              Bit operators
-Operation             >Result
-~x        the bits of x inverted
-x ^ y     bitwise exclusive or of x and y
-x & y     bitwise and of x and y
-x | y     bitwise or of x and y
-x << n    x shifted left by n bits
-x >> n    x shifted right by n bits
-
-Complex Numbers
-
-  * represented as a pair of machine-level double precision floating point
-    numbers.
-  * The real and imaginary value of a complex number z can be retrieved through
-    the attributes z.real and z.imag.
-
-Numeric exceptions
-
-TypeError
-    raised on application of arithmetic operation to non-number
-OverflowError
-     numeric bounds exceeded
-ZeroDivisionError
-     raised when zero second argument of div or modulo op
-FloatingPointError
-     raised when a floating point operation fails
-
-Operations on all sequence types (lists, tuples, strings)
-
-                Operations on all sequence types
-Operation                     Result                     Notes
-x in s     True if an item of s is equal to x, else False
-x not in s False if an item of s is equal to x, else True
-for x in s: loops over the sequence
-s + t      the concatenation of s and t
-s * n, n*s n copies of s concatenated
-s[i]       i'th item of s, origin 0                       (1)
-s[i:j]     slice of s from i (included) to j (excluded) (1), (2)
-len(s)     length of s
-min(s)     smallest item of s
-max(s)     largest item of (s)
-iter(s)    returns an iterator over s.  iterators define __iter__ and next()
-
-Notes :
-    (1) if i or j is negative, the index is relative to the end of the string,
-ie len(s)+ i or len(s)+j is
-         substituted. But note that -0 is still 0.
-    (2) The slice of s from i to j is defined as the sequence of items with
-index k such that i <= k < j.
-          If i or j is greater than len(s), use len(s). If i is omitted, use
-len(s). If i is greater than or
-          equal to j, the slice is empty.
-
-Operations on mutable (=modifiable) sequences (lists)
-
-                 Operations on mutable sequences
-   Operation                      Result                   Notes
-s[i] =x          item i of s is replaced by x
-s[i:j] = t       slice of s from i to j is replaced by t
-del s[i:j]       same as s[i:j] = []
-s.append(x)      same as s[len(s) : len(s)] = [x]
-s.count(x)       return number of i's for which s[i] == x
-s.extend(x)      same as s[len(s):len(s)]= x
-s.index(x)       return smallest i such that s[i] == x      (1)
-s.insert(i, x)   same as s[i:i] = [x] if i >= 0
-s.pop([i])       same as x = s[i]; del s[i]; return x       (4)
-s.remove(x)      same as del s[s.index(x)]                  (1)
-s.reverse()      reverse the items of s in place            (3)
-s.sort([cmpFct]) sort the items of s in place             (2), (3)
-
-Notes :
-    (1) raise a ValueError exception when x is not found in s (i.e. out of
-range).
-     (2) The sort() method takes an optional argument specifying a comparison
-fct of 2 arguments (list items) which should
-          return -1, 0, or 1 depending on whether the 1st argument is
-considered smaller than, equal to, or larger than the 2nd
-          argument. Note that this slows the sorting process down considerably.
-     (3) The sort() and reverse() methods modify the list in place for economy
-of space when sorting or reversing a large list.
-           They don't return the sorted or reversed list to remind you of this
-side effect.
-     (4) [New 1.5.2] The optional  argument i defaults to -1, so that by default the last
-item is removed and returned.
-
-
-
-Operations on mappings (dictionaries)
-
-                         Operations on mappings
-        Operation                          Result                  Notes
-len(d)                     the number of items in d
-d[k]                       the item of d with key k                 (1)
-d[k] = x                   set d[k] to x
-del d[k]                   remove d[k] from d                       (1)
-d.clear()                  remove all items from d
-d.copy()                   a shallow copy of d
-d.get(k,defaultval)        the item of d with key k                 (4)
-d.has_key(k)               True if d has key k, else False
-d.items()                  a copy of d's list of (key, item) pairs  (2)
-d.iteritems()              an iterator over (key, value) pairs      (7)
-d.iterkeys()               an iterator over the keys of d           (7)
-d.itervalues()             an iterator over the values of d         (7)
-d.keys()                   a copy of d's list of keys               (2)
-d1.update(d2)              for k, v in d2.items(): d1[k] = v        (3)
-d.values()                 a copy of d's list of values             (2)
-d.pop(k)                   remove d[k] and return its value
-d.popitem()                remove and return an arbitrary           (6)
-                           (key, item) pair
-d.setdefault(k,defaultval) the item of d with key k                 (5)
-
-    Notes :
-      TypeError is raised if key is not acceptable
-      (1) KeyError is raised if key k is not in the map
-      (2) Keys and values are listed in random order
-      (3) d2 must be of the same type as d1
-      (4) Never raises an exception if k is not in the map, instead it returns
-    defaultVal.
-          defaultVal is optional, when not provided and k is not in the map,
-    None is returned.
-      (5) Never raises an exception if k is not in the map, instead it returns
-    defaultVal, and adds k to map with value defaultVal. defaultVal is
-    optional. When not provided and k is not in the map, None is returned and
-    added to map.
-      (6) Raises a KeyError if the dictionary is emtpy.
-      (7) While iterating over a dictionary, the values may be updated but
-          the keys cannot be changed.
-
-Operations on strings
-
-Note that these string methods largely (but not completely) supersede the
-functions available in the string module.
-
-
-                             Operations on strings
-    Operation                             Result                          Notes
-s.capitalize()    return a copy of s with only its first character
-                  capitalized.
-s.center(width)   return a copy of s centered in a string of length width  (1)
-                  .
-s.count(sub[      return the number of occurrences of substring sub in     (2)
-,start[,end]])    string s.
-s.decode(([       return a decoded version of s.                           (3)
-  encoding
-  [,errors]])
-s.encode([        return an encoded version of s. Default encoding is the
-  encoding        current default string encoding.                         (3)
-  [,errors]])
-s.endswith(suffix return true if s ends with the specified suffix,         (2)
-  [,start[,end]]) otherwise return False.
-s.expandtabs([    return a copy of s where all tab characters are          (4)
-tabsize])         expanded using spaces.
-s.find(sub[,start return the lowest index in s where substring sub is      (2)
-[,end]])          found. Return -1 if sub is not found.
-s.index(sub[      like find(), but raise ValueError when the substring is  (2)
-,start[,end]])    not found.
-s.isalnum()       return True if all characters in s are alphanumeric,     (5)
-                  False otherwise.
-s.isalpha()       return True if all characters in s are alphabetic,       (5)
-                  False otherwise.
-s.isdigit()       return True if all characters in s are digit             (5)
-                  characters, False otherwise.
-s.islower()       return True if all characters in s are lowercase, False  (6)
-                  otherwise.
-s.isspace()       return True if all characters in s are whitespace        (5)
-                  characters, False otherwise.
-s.istitle()       return True if string s is a titlecased string, False    (7)
-                  otherwise.
-s.isupper()       return True if all characters in s are uppercase, False  (6)
-                  otherwise.
-s.join(seq)       return a concatenation of the strings in the sequence
-                  seq, separated by 's's.
-s.ljust(width)    return s left justified in a string of length width.    (1),
-                                                                           (8)
-s.lower()         return a copy of s converted to lowercase.
-s.lstrip()        return a copy of s with leading whitespace removed.
-s.replace(old,    return a copy of s with all occurrences of substring     (9)
-new[, maxsplit])  old replaced by new.
-s.rfind(sub[      return the highest index in s where substring sub is     (2)
-,start[,end]])    found. Return -1 if sub is not found.
-s.rindex(sub[     like rfind(), but raise ValueError when the substring    (2)
-,start[,end]])    is not found.
-s.rjust(width)    return s right justified in a string of length width.   (1),
-                                                                           (8)
-s.rstrip()        return a copy of s with trailing whitespace removed.
-s.split([sep[     return a list of the words in s, using sep as the       (10)
-,maxsplit]])      delimiter string.
-s.splitlines([    return a list of the lines in s, breaking at line       (11)
-keepends])        boundaries.
-s.startswith      return true if s starts with the specified prefix,
-(prefix[,start[   otherwise return false.                                  (2)
-,end]])
-s.strip()         return a copy of s with leading and trailing whitespace
-                  removed.
-s.swapcase()      return a copy of s with uppercase characters converted
-                  to lowercase and vice versa.
-                  return a titlecased copy of s, i.e. words start with
-s.title()         uppercase characters, all remaining cased characters
-                  are lowercase.
-s.translate(table return a copy of s mapped through translation table     (12)
-[,deletechars])   table.
-s.upper()         return a copy of s converted to uppercase.
-s.zfill(width)    return a string padded with zeroes on the left side and
-                  sliding a minus sign left if necessary.  never truncates.
-
-Notes :
-    (1) Padding is done using spaces.
-    (2) If optional argument start is supplied, substring s[start:] is
-processed. If optional arguments start and end are supplied, substring s[start:
-end] is processed.
-    (3) Optional argument errors may be given to set a different error handling
-scheme. The default for errors is 'strict', meaning that encoding errors raise
-a ValueError. Other possible values are 'ignore' and 'replace'.
-    (4) If optional argument tabsize is not given, a tab size of 8 characters
-is assumed.
-    (5) Returns false if string s does not contain at least one character.
-    (6) Returns false if string s does not contain at least one cased
-character.
-    (7) A titlecased string is a string in which uppercase characters may only
-follow uncased characters and lowercase characters only cased ones.
-    (8) s is returned if width is less than len(s).
-    (9) If the optional argument maxsplit is given, only the first maxsplit
-occurrences are replaced.
-    (10) If sep is not specified or None, any whitespace string is a separator.
-If maxsplit is given, at most maxsplit splits are done.
-    (11) Line breaks are not included in the resulting list unless keepends is
-given and true.
-    (12) table must be a string of length 256. All characters occurring in the
-optional argument deletechars are removed prior to translation.
-
-String formatting with the % operator
-
-formatString % args--> evaluates to a string
-
-  * formatString uses C printf format codes : %, c, s, i, d, u, o, x, X, e, E,
-    f, g, G, r (details below).
-  * Width and precision may be a * to specify that an integer argument gives
-    the actual width or precision.
-  * The flag characters -, +, blank, # and 0 are understood. (details below)
-  * %s will convert any type argument to string (uses str() function)
-  * args may be a single arg or a tuple of args
-
-        '%s has %03d quote types.' % ('Python', 2)  # => 'Python has 002 quote types.'
-
-  * Right-hand-side can also be a mapping:
-
-        a = '%(lang)s has %(c)03d quote types.' % {'c':2, 'lang':'Python}
-(vars() function very handy to use on right-hand-side.)
-
-                                 Format codes
-Conversion                               Meaning
-d          Signed integer decimal.
-i          Signed integer decimal.
-o          Unsigned octal.
-u          Unsigned decimal.
-x          Unsigned hexadecimal (lowercase).
-X          Unsigned hexadecimal (uppercase).
-e          Floating point exponential format (lowercase).
-E          Floating point exponential format (uppercase).
-f          Floating point decimal format.
-F          Floating point decimal format.
-g          Same as "e" if exponent is greater than -4 or less than precision,
-           "f" otherwise.
-G          Same as "E" if exponent is greater than -4 or less than precision,
-           "F" otherwise.
-c          Single character (accepts integer or single character string).
-r          String (converts any python object using repr()).
-s          String (converts any python object using str()).
-%          No argument is converted, results in a "%" character in the result.
-           (The complete specification is %%.)
-
-                          Conversion flag characters
-Flag                                  Meaning
-#    The value conversion will use the ``alternate form''.
-0    The conversion will be zero padded.
--    The converted value is left adjusted (overrides "-").
-     (a space) A blank should be left before a positive number (or empty
-     string) produced by a signed conversion.
-+    A sign character ("+" or "-") will precede the conversion (overrides a
-     "space" flag).
-
-File Objects
-
-Created with built-in function open; may be created by other modules' functions
-as well.
-
-Operators on file objects
-
-                                File operations
-    Operation                                Result
-f.close()         Close file f.
-f.fileno()        Get fileno (fd) for file f.
-f.flush()         Flush file f's internal buffer.
-f.isatty()        True if file f is connected to a tty-like dev, else False.
-f.read([size])    Read at most size bytes from file f and return as a string
-                  object. If size omitted, read to EOF.
-f.readline()      Read one entire line from file f.
-f.readlines()     Read until EOF with readline() and return list of lines read.
-                  Set file f's position, like "stdio's fseek()".
-f.seek(offset[,   whence == 0 then use absolute indexing.
-whence=0])        whence == 1 then offset relative to current pos.
-                  whence == 2 then offset relative to file end.
-f.tell()          Return file f's current position (byte offset).
-f.write(str)      Write string to file f.
-f.writelines(list Write list of strings to file f.
-)
-
-File Exceptions
-
-  EOFError
-     End-of-file hit when reading (may be raised many times, e.g. if f is a
-    tty).
-  IOError
-     Other I/O-related I/O operation failure.
-  OSError
-     OS system call failed.
-
-
-    Advanced Types
-
-    -See manuals for more details -
-      + Module objects
-      + Class objects
-      + Class instance objects
-      + Type objects (see module: types)
-      + File objects (see above)
-      + Slice objects
-      + XRange objects
-      + Callable types:
-          o User-defined (written in Python):
-              # User-defined Function objects
-              # User-defined Method objects
-          o Built-in (written in C):
-              # Built-in Function objects
-              # Built-in Method objects
-      + Internal Types:
-          o Code objects (byte-compile executable Python code: bytecode)
-          o Frame objects (execution frames)
-          o Traceback objects (stack trace of an exception)
-
-
-    Statements
-
-    pass            -- Null statement
-    del name[,name]* -- Unbind name(s) from object. Object will be indirectly
-                        (and automatically) deleted only if no longer referenced.
-    print [>> fileobject,] [s1 [, s2 ]* [,]
-                    -- Writes to sys.stdout, or to fileobject if supplied.
-                       Puts spaces between arguments. Puts newline at end
-                       unless statement ends with comma.
-                       Print is not required when running interactively,
-                       simply typing an expression will print its value,
-                       unless the value is None.
-    exec x [in globals [,locals]]
-                    -- Executes x in namespaces provided. Defaults
-                       to current namespaces. x can be a string, file
-                       object or a function object.
-    callable(value,... [id=value], [*args], [**kw])
-                    -- Call function callable with parameters. Parameters can
-                       be passed by name or be omitted if function
-                       defines default values. E.g. if callable is defined as
-                       "def callable(p1=1, p2=2)"
-                       "callable()"       <=>  "callable(1, 2)"
-                       "callable(10)"     <=>  "callable(10, 2)"
-                       "callable(p2=99)"  <=>  "callable(1, 99)"
-                       *args is a tuple of positional arguments.
-                       **kw is a dictionary of keyword arguments.
-
-    Assignment operators
-
-                              Caption
-    Operator                    Result                     Notes
-    a = b    Basic assignment - assign object b to label a  (1)
-    a += b   Roughly equivalent to a = a + b                (2)
-    a -= b   Roughly equivalent to a = a - b                (2)
-    a *= b   Roughly equivalent to a = a * b                (2)
-    a /= b   Roughly equivalent to a = a / b                (2)
-    a %= b   Roughly equivalent to a = a % b                (2)
-    a **= b  Roughly equivalent to a = a ** b               (2)
-    a &= b   Roughly equivalent to a = a & b                (2)
-    a |= b   Roughly equivalent to a = a | b                (2)
-    a ^= b   Roughly equivalent to a = a ^ b                (2)
-    a >>= b  Roughly equivalent to a = a >> b               (2)
-    a <<= b  Roughly equivalent to a = a << b               (2)
-
-    Notes :
-        (1) Can unpack tuples, lists, and strings.
-           first, second = a[0:2]; [f, s] = range(2); c1,c2,c3='abc'
-           Tip: x,y = y,x swaps x and y.
-        (2) Not exactly equivalent - a is evaluated only once. Also, where
-    possible, operation performed in-place - a is modified rather than
-    replaced.
-
-    Control Flow
-
-    if condition: suite
-    [elif condition: suite]*
-    [else: suite]   -- usual if/else_if/else statement
-    while condition: suite
-    [else: suite]
-                    -- usual while statement. "else" suite is executed
-                       after loop exits, unless the loop is exited with
-                       "break"
-    for element in sequence: suite
-    [else: suite]
-                    -- iterates over sequence, assigning each element to element.
-                       Use built-in range function to iterate a number of times.
-                       "else" suite executed at end unless loop exited
-                       with "break"
-    break           -- immediately exits "for" or "while" loop
-    continue        -- immediately does next iteration of "for" or "while" loop
-    return [result] -- Exits from function (or method) and returns result (use a tuple to
-                       return more than one value). If no result given, then returns None.
-    yield result    -- Freezes the execution frame of a generator and returns the result
-                       to the iterator's .__next__() method.  Upon the next call to __next__(),
-                       resumes execution at the frozen point with all of the local variables
-                       still intact.
-
-    Exception Statements
-
-    assert expr[, message]
-                    -- expr is evaluated. if false, raises exception AssertionError
-                       with message. Inhibited if __debug__ is 0.
-    try: suite1
-    [except [exception [, value]: suite2]+
-    [else: suite3]
-                    -- statements in suite1 are executed. If an exception occurs, look
-                       in "except" clauses for matching <exception>. If matches or bare
-                       "except" execute suite of that clause. If no exception happens
-                       suite in "else" clause is executed after suite1.
-                       If exception has a value, it is put in value.
-                       exception can also be tuple of exceptions, e.g.
-                       "except (KeyError, NameError), val: print val"
-    try: suite1
-    finally: suite2
-                    -- statements in suite1 are executed. If no
-                       exception, execute suite2 (even if suite1 is
-                       exited with a "return", "break" or "continue"
-                       statement). If exception did occur, executes
-                       suite2 and then immediately reraises exception.
-    raise exception [,value [, traceback]]
-                    -- raises exception with optional value
-                       value. Arg traceback specifies a traceback object to
-                       use when printing the exception's backtrace.
-    raise           -- a raise statement without arguments re-raises
-                       the last exception raised in the current function
-An exception is either a string (object) or a class instance.
-  Can create a new one simply by creating a new string:
-
-              my_exception = 'You did something wrong'
-      try:
-                   if bad:
-              raise my_exception, bad
-      except my_exception, value:
-                    print 'Oops', value
-
-Exception classes must be derived from the predefined class: Exception, e.g.:
-            class text_exception(Exception): pass
-            try:
-                if bad:
-                    raise text_exception()
-                    # This is a shorthand for the form
-                    # "raise <class>, <instance>"
-             except Exception:
-                 print 'Oops'
-                 # This will be printed because
-                 # text_exception is a subclass of Exception
-When an error message is printed for an unhandled exception which is a
-class, the class name is printed, then a colon and a space, and
-finally the instance converted to a string using the built-in function
-str().
-All built-in exception classes derives from Exception, itself
-derived from BaseException.
-
-Name Space Statements
-
-[1.51: On Mac & Windows, the case of module file names must now match the case
-as used
-  in the import statement]
-Packages (>1.5): a package is a name space which maps to a directory including
-                module(s) and the special initialization module '__init__.py'
-                (possibly empty). Packages/dirs can be nested. You address a
-                module's symbol via '[package.[package...]module.symbol's.
-import module1 [as name1] [, module2]*
-                -- imports modules. Members of module must be
-                   referred to by qualifying with [package.]module name:
-                   "import sys; print sys.argv:"
-                   "import package1.subpackage.module; package1.subpackage.module.foo()"
-                   module1 renamed as name1, if supplied.
-from module import name1 [as othername1] [, name2]*
-                -- imports names from module module in current namespace.
-                   "from sys import argv; print argv"
-                   "from package1 import module; module.foo()"
-                   "from package1.module import foo; foo()"
-                   name1 renamed as othername1, if supplied.
-from module import *
-                -- imports all names in module, except those starting with "_";
-                   *to be used sparsely, beware of name clashes* :
-                   "from sys import *; print argv"
-                   "from package.module import *; print x'
-                    NB: "from package import *" only imports the symbols defined
-                    in the package's __init__.py file, not those in the
-                    template modules!
-global name1 [, name2]*
-                -- names are from global scope (usually meaning from module)
-                   rather than local (usually meaning only in function).
-                -- E.g. in fct without "global" statements, assuming
-                   "a" is name that hasn't been used in fct or module
-                   so far:
-                   -Try to read from "a" -> NameError
-                   -Try to write to "a" -> creates "a" local to fcn
-                   -If "a" not defined in fct, but is in module, then
-                       -Try to read from "a", gets value from module
-                       -Try to write to "a", creates "a" local to fct
-                   But note "a[0]=3" starts with search for "a",
-                   will use to global "a" if no local "a".
-
-Function Definition
-
-def func_id ([param_list]): suite
-                -- Creates a function object & binds it to name func_id.
-
-    param_list ::= [id [, id]*]
-    id ::= value | id = value | *id | **id
-    [Args are passed by value.Thus only args representing a mutable object
-    can be modified (are inout parameters). Use a tuple to return more than
-    one value]
-
-Example:
-        def test (p1, p2 = 1+1, *rest, **keywords):
-            -- Parameters with "=" have default value (v is
-               evaluated when function defined).
-               If list has "*id" then id is assigned a tuple of
-               all remaining args passed to function (like C vararg)
-               If list has "**id" then id is assigned a dictionary of
-               all extra arguments passed as keywords.
-
-Class Definition
-
-class <class_id> [(<super_class1> [,<super_class2>]*)]: <suite>
-        -- Creates a class object and assigns it name <class_id>
-           <suite> may contain local "defs" of class methods and
-           assignments to class attributes.
-Example:
-       class my_class (class1, class_list[3]): ...
-                  Creates a class object inheriting from both "class1" and whatever
-                  class object "class_list[3]" evaluates to. Assigns new
-                  class object to name "my_class".
-        - First arg to class methods is always instance object, called 'self'
-          by convention.
-        - Special method __init__() is called when instance is created.
-        - Special method __del__() called when no more reference to object.
-        - Create instance by "calling" class object, possibly with arg
-          (thus instance=apply(aClassObject, args...) creates an instance!)
-        - In current implementation, can't subclass off built-in
-          classes. But can "wrap" them, see UserDict & UserList modules,
-          and see __getattr__() below.
-Example:
-        class c (c_parent):
-           def __init__(self, name): self.name = name
-           def print_name(self): print "I'm", self.name
-           def call_parent(self): c_parent.print_name(self)
-           instance = c('tom')
-           print instance.name
-           'tom'
-           instance.print_name()
-           "I'm tom"
-        Call parent's super class by accessing parent's method
-        directly and passing "self" explicitly (see "call_parent"
-        in example above).
-        Many other special methods available for implementing
-        arithmetic operators, sequence, mapping indexing, etc.
-
-Documentation Strings
-
-Modules, classes and functions may be documented by placing a string literal by
-itself as the first statement in the suite. The documentation can be retrieved
-by getting the '__doc__' attribute from the module, class or function.
-Example:
-        class C:
-            "A description of C"
-            def __init__(self):
-                "A description of the constructor"
-                # etc.
-Then c.__doc__ == "A description of C".
-Then c.__init__.__doc__ == "A description of the constructor".
-
-Others
-
-lambda [param_list]: returnedExpr
-                -- Creates an anonymous function. returnedExpr must be
-                   an expression, not a statement (e.g., not "if xx:...",
-                   "print xxx", etc.) and thus can't contain newlines.
-                   Used mostly for filter(), map() functions, and GUI callbacks..
-List comprehensions
-result = [expression for item1 in sequence1  [if condition1]
-                        [for item2 in sequence2 ... for itemN in sequenceN]
-                      ]
-is equivalent to:
-result = []
-for item1 in sequence1:
-    for item2 in sequence2:
-    ...
-        for itemN in sequenceN:
-             if (condition1) and furthur conditions:
-                  result.append(expression)
-
-
-
-Built-In Functions
-
-                              Built-In Functions
-     Function                                 Result
-__import__(name[,   Imports module within the given context (see lib ref for
-globals[, locals[,  more details)
-fromlist]]])
-abs(x)              Return the absolute value of number x.
-bool(x)             Returns True when the argument x is true and False otherwise.
-buffer(obj)         Creates a buffer reference to an object.
-chr(i)              Returns one-character string whose ASCII code isinteger i
-classmethod(f)      Converts a function f, into a method with the class as the
-                    first argument.  Useful for creating alternative constructors.
-cmp(x,y)            Returns negative, 0, positive if x <, ==, > to y
-compile(string,     from which the code was read, or eg. '<string>'if not read
-filename, kind)     from file.kind can be 'eval' if string is a single stmt, or
-                    'single' which prints the output of expression statements
-                    that evaluate to something else than None, or be 'exec'.
-complex(real[,      Builds a complex object (can also be done using J or j
-image])             suffix,e.g. 1+3J)
-delattr(obj, name)  deletes attribute named name of object obj <=> del obj.name
-                    If no args, returns the list of names in current
-dict([items])       Create a new dictionary from the specified item list.
-dir([object])       local symbol table. With a module, class or class
-                    instance object as arg, returns list of names in its attr.
-                    dict.
-divmod(a,b)         Returns tuple of (a/b, a%b)
-enumerate(seq)      Return a iterator giving:  (0, seq[0]), (1, seq[1]), ...
-eval(s[, globals[,  Eval string s in (optional) globals, locals contexts.s must
-locals]])           have no NUL's or newlines. s can also be acode object.
-                    Example: x = 1; incr_x = eval('x + 1')
-filter(function,    Constructs a list from those elements of sequence for which
-sequence)           function returns true. function takes one parameter.
-float(x)            Converts a number or a string to floating point.
-getattr(object,     [<default> arg added in 1.5.2]Gets attribute called name
-name[, default]))   from object,e.g. getattr(x, 'f') <=> x.f). If not found,
-                    raises AttributeError or returns default if specified.
-globals()           Returns a dictionary containing current global variables.
-hasattr(object,     Returns true if object has attr called name.
-name)
-hash(object)        Returns the hash value of the object (if it has one)
-help(f)             Display documentation on object f.
-hex(x)              Converts a number x to a hexadecimal string.
-id(object)          Returns a unique 'identity' integer for an object.
-int(x[, base])      base paramenter specifies base from which to convert string
-                    values.
-isinstance(obj,     Returns true if obj is an instance of class. Ifissubclass
-class)              (A,B) then isinstance(x,A) => isinstance(x,B)
-issubclass(class1,  returns true if class1 is derived from class2
-class2)
-                    Returns the length (the number of items) of an object
-iter(collection)    Returns an iterator over the collection.
-len(obj)            (sequence, dictionary, or instance of class implementing
-                    __len__).
-list(sequence)      Converts sequence into a list. If already a list,returns a
-                    copy of it.
-locals()            Returns a dictionary containing current local variables.
-                    Applies function to every item of list and returns a listof
-map(function, list, the results. If additional arguments are passed,function
-...)                must take that many arguments and it is givento function on
-                    each call.
-max(seq)            Returns the largest item of the non-empty sequence seq.
-min(seq)            Returns the smallest item of a non-empty sequence seq.
-oct(x)              Converts a number to an octal string.
-open(filename [,    Returns a new file object. First two args are same asthose
-mode='r', [bufsize= for C's "stdio open" function. bufsize is 0for unbuffered,
-implementation      1 for line-buffered, negative forsys-default, all else, of
-dependent]])        (about) given size.
-ord(c)              Returns integer ASCII value of c (a string of len 1). Works
-                    with Unicode char.
-object()            Create a base type.  Used as a superclass for new-style objects.
-open(name           Open a file.
-  [, mode
-  [, buffering]])
-pow(x, y [, z])     Returns x to power y [modulo z]. See also ** operator.
-property()          Created a property with access controlled by functions.
-range(start [,end   Returns list of ints from >= start and < end. With 1 arg,
-[, step]])          list from 0..arg-1. With 2 args, list from start..end-1.
-                    With 3 args, list from start up to end by step
-                    after fixing it.
-repr(object)        Returns a string containing a printable and if possible
-                    evaluable representation of an object. 
-                    Class redefinable (__repr__). See also str().
-round(x, n=0)       Returns the floating point value x rounded to n digitsafter
-                    the decimal point.
-setattr(object,     This is the counterpart of getattr(). setattr(o, 'foobar',
-name, value)        3) <=> o.foobar = 3. Creates attribute if it doesn't exist!
-slice([start,] stop Returns a slice object representing a range, with R/
-[, step])           O attributes: start, stop, step.
-staticmethod()      Convert a function to method with no self or class
-                    argument.  Useful for methods associated with a class that
-                    do not need access to an object's internal state.
-str(object)         Returns a string containing a nicely
-                    printable representation of an object. Class overridable
-                    (__str__).See also repr().
-super(type)         Create an unbound super object.  Used to call cooperative
-                    superclass methods.
-sum(sequence,       Add the values in the sequence and return the sum.
-    [start]) 
-tuple(sequence)     Creates a tuple with same elements as sequence. If already
-                    a tuple, return itself (not a copy).
-                    Returns a type object [see module types] representing
-                    thetype of obj. Example: import typesif type(x) ==
-type(obj)           types.StringType: print 'It is a string'NB: it is
-                    recommanded to use the following form:if isinstance(x,
-                    types.StringType): etc...
-unichr(code)        code.
-unicode(string[,    Creates a Unicode string from a 8-bit string, using
-encoding[, error    thegiven encoding name and error treatment ('strict',
-]]])                'ignore',or 'replace'}.
-                    Without arguments, returns a dictionary correspondingto the
-                    current local symbol table. With a module,class or class
-vars([object])      instance object as argumentreturns a dictionary
-                    corresponding to the object'ssymbol table. Useful with "%"
-                    formatting operator.
-zip(seq1[, seq2,    Returns an iterator of tuples where each tuple contains
-...])               the nth element of each of the argument sequences.
-
-
-
-Built-In Exceptions
-
-Exception>
-         Root class for all exceptions
-    SystemExit
-         On 'sys.exit()'
-    StopIteration
-         Signal the end from iterator.__next__()
-        ArithmeticError
-                 Base class for OverflowError, ZeroDivisionError,
-    FloatingPointError
-            FloatingPointError
-                       When a floating point operation fails.
-            OverflowError
-                            On excessively large arithmetic operation
-            ZeroDivisionError
-                  On division or modulo operation with 0 as 2nd arg
-            AssertionError
-                When an assert statement fails.
-        AttributeError
-                    On attribute reference or assignment failure
-        EnvironmentError    [new in 1.5.2]
-                On error outside Python; error arg tuple is (errno, errMsg...)
-            IOError    [changed in 1.5.2]
-               I/O-related operation failure
-            OSError    [new in 1.5.2]
-               used by the os module's os.error exception.
-        EOFError
-                    Immediate end-of-file hit by input() or raw_input()
-        ImportError
-         On failure of `import' to find module or name
-        KeyboardInterrupt
-         On user entry of the interrupt key (often `Control-C')
-        LookupError
-                base class for IndexError, KeyError
-            IndexError
-                 On out-of-range sequence subscript
-            KeyError
-                 On reference to a non-existent mapping (dict) key
-        MemoryError
-         On recoverable memory exhaustion
-        NameError
-         On failure to find a local or global (unqualified) name
-        RuntimeError
-         Obsolete catch-all; define a suitable error instead
-          NotImplementedError   [new in 1.5.2]
-                On method not implemented
-        SyntaxError
-         On parser encountering a syntax error
-       IndentationError
-           On parser encountering an indentation syntax error
-       TabError
-           On parser encountering an indentation syntax error
-        SystemError
-         On non-fatal interpreter error - bug - report it
-        TypeError
-         On passing inappropriate type to built-in op or func
-        ValueError
-         On arg error not covered by TypeError or more precise
-    Warning
-              UserWarning
-              DeprecationWarning
-              PendingDeprecationWarning
-              SyntaxWarning
-              RuntimeWarning
-              FutureWarning
-
-
-
-Standard methods & operators redefinition in classes
-
-Standard methods & operators map to special '__methods__' and thus may be
- redefined (mostly in user-defined classes), e.g.:
-    class x:
-         def __init__(self, v): self.value = v
-         def __add__(self, r): return self.value + r
-    a = x(3) # sort of like calling x.__init__(a, 3)
-    a + 4    # is equivalent to a.__add__(4)
-
-Special methods for any class
-
-(s: self, o: other)
-        __init__(s, args) instance initialization (on construction)
-        __del__(s)        called on object demise (refcount becomes 0)
-        __repr__(s)       repr() and `...` conversions
-        __str__(s)        str() and 'print' statement
-        __cmp__(s, o)     Compares s to o and returns <0, 0, or >0.
-                          Implements >, <, == etc...
-        __hash__(s)       Compute a 32 bit hash code; hash() and dictionary ops
-        __bool__(s)    Returns False or True for truth value testing
-        __getattr__(s, name)  called when attr lookup doesn't find <name>
-        __setattr__(s, name, val) called when setting an attr
-                                  (inside, don't use "self.name = value"
-                                   use "self.__dict__[name] = val")
-        __delattr__(s, name)  called to delete attr <name>
-        __call__(self, *args) called when an instance is called as function.
-
-Operators
-
-    See list in the operator module. Operator function names are provided with
-    2 variants, with or without
-    ading & trailing '__' (eg. __add__ or add).
-
-    Numeric operations special methods
-    (s: self, o: other)
-
-        s+o       =  __add__(s,o)         s-o        =  __sub__(s,o)
-        s*o       =  __mul__(s,o)         s/o        =  __div__(s,o)
-        s%o       =  __mod__(s,o)         divmod(s,o) = __divmod__(s,o)
-        s**o      =  __pow__(s,o)
-        s&o       =  __and__(s,o)
-        s^o       =  __xor__(s,o)         s|o        =  __or__(s,o)
-        s<<o      =  __lshift__(s,o)      s>>o       =  __rshift__(s,o)
-        bool(s) = __bool__(s) (used in boolean testing)
-        -s        =  __neg__(s)           +s         =  __pos__(s)
-        abs(s)    =  __abs__(s)           ~s         =  __invert__(s)  (bitwise)
-        s+=o      =  __iadd__(s,o)        s-=o       =  __isub__(s,o)
-        s*=o      =  __imul__(s,o)        s/=o       =  __idiv__(s,o)
-        s%=o      =  __imod__(s,o)
-        s**=o     =  __ipow__(s,o)
-        s&=o      =  __iand__(s,o)
-        s^=o      =  __ixor__(s,o)        s|=o       =  __ior__(s,o)
-        s<<=o     =  __ilshift__(s,o)     s>>=o      =  __irshift__(s,o)
-        Conversions
-        int(s)    =  __int__(s)
-        float(s)  =  __float__(s)         complex(s)    =  __complex__(s)
-        oct(s)    =  __oct__(s)           hex(s)     =  __hex__(s)
-        Right-hand-side equivalents for all binary operators exist;
-        are called when class instance is on r-h-s of operator:
-        a + 3  calls __add__(a, 3)
-        3 + a  calls __radd__(a, 3)
-
-    All seqs and maps, general operations plus:
-    (s: self, i: index or key)
-
-        len(s)    = __len__(s)        length of object, >= 0.  Length 0 == false
-        s[i]      = __getitem__(s,i)  Element at index/key i, origin 0
-
-    Sequences, general methods, plus:
-      s[i]=v           = __setitem__(s,i,v)
-      del s[i]         = __delitem__(s,i)
-      s[i:j]           = __getslice__(s,i,j)
-      s[i:j]=seq       = __setslice__(s,i,j,seq)
-      del s[i:j]       = __delslice__(s,i,j)   == s[i:j] = []
-      seq * n          = __repeat__(seq, n)
-      s1 + s2          = __concat__(s1, s2)
-      i in s           = __contains__(s, i)
-    Mappings, general methods, plus
-      hash(s)          = __hash__(s) - hash value for dictionary references
-      s[k]=v           = __setitem__(s,k,v)
-      del s[k]         = __delitem__(s,k)
-
-Special informative state attributes for some types:
-
-    Modules:
-        __doc__ (string/None, R/O): doc string (<=> __dict__['__doc__'])
-        __name__(string, R/O): module name (also in __dict__['__name__'])
-        __dict__ (dict, R/O): module's name space
-        __file__(string/undefined, R/O): pathname of .pyc, .pyo or .pyd (undef for
-                 modules statically linked to the interpreter)
-
-    Classes:    [in bold: writable since 1.5.2]
-        __doc__ (string/None, R/W): doc string (<=> __dict__['__doc__'])
-        __module__ is the module name in which the class was defined
-        __name__(string, R/W): class name (also in __dict__['__name__'])
-        __bases__ (tuple, R/W): parent classes
-        __dict__ (dict, R/W): attributes (class name space)
-
-    Instances:
-        __class__ (class, R/W): instance's class
-        __dict__ (dict, R/W): attributes
-
-    User-defined functions: [bold: writable since 1.5.2]
-        __doc__ (string/None, R/W): doc string
-        __name__(string, R/O): function name
-        func_doc (R/W): same as __doc__
-        func_name (R/O): same as __name__
-        func_defaults (tuple/None, R/W): default args values if any
-        func_code (code, R/W): code object representing the compiled function body
-        func_globals (dict, R/O): ref to dictionary of func global variables
-        func_dict (dict, R/W):  same as __dict__ contains the namespace supporting
-            arbitrary function attributes
-        func_closure (R/O): None or a tuple of cells that contain bindings
-            for the function's free variables.
-
-
-    User-defined Methods:
-        __doc__ (string/None, R/O): doc string
-        __name__(string, R/O): method name (same as im_func.__name__)
-        im_class (class, R/O): class defining the method (may be a base class)
-        im_self (instance/None, R/O): target instance object (None if unbound)
-        im_func (function, R/O): function object
-
-    Built-in Functions & methods:
-        __doc__ (string/None, R/O): doc string
-        __name__ (string, R/O): function name
-        __self__ : [methods only] target object
-
-    Codes:
-        co_name (string, R/O): function name
-        co_argcount (int, R/0): number of positional args
-        co_nlocals (int, R/O): number of local vars (including args)
-        co_varnames (tuple, R/O): names of local vars (starting with args)
-        co_cellvars (tuple, R/O)) the names of local variables referenced by
-            nested functions
-        co_freevars (tuple, R/O)) names of free variables
-        co_code (string, R/O): sequence of bytecode instructions
-        co_consts (tuple, R/O): litterals used by the bytecode, 1st one is
-                                fct doc (or None)
-        co_names (tuple, R/O): names used by the bytecode
-        co_filename (string, R/O): filename from which the code was compiled
-        co_firstlineno (int, R/O): first line number of the function
-        co_lnotab (string, R/O): string encoding bytecode offsets to line numbers.
-        co_stacksize (int, R/O): required stack size (including local vars)
-        co_flags (int, R/O): flags for the interpreter
-                           bit 2 set if fct uses "*arg" syntax
-                           bit 3 set if fct uses '**keywords' syntax
-    Frames:
-        f_back (frame/None, R/O): previous stack frame (toward the caller)
-        f_code (code, R/O): code object being executed in this frame
-        f_locals (dict, R/O): local vars
-        f_globals (dict, R/O): global vars
-        f_builtins (dict, R/O): built-in (intrinsic) names
-        f_restricted (int, R/O): flag indicating whether fct is executed in
-                                 restricted mode
-        f_lineno (int, R/O): current line number
-        f_lasti (int, R/O): precise instruction (index into bytecode)
-        f_trace (function/None, R/W): debug hook called at start of each source line
-    Tracebacks:
-        tb_next (frame/None, R/O): next level in stack trace (toward the frame where
-                                  the exception occurred)
-        tb_frame (frame, R/O): execution frame of the current level
-        tb_lineno (int, R/O): line number where the exception occurred
-        tb_lasti (int, R/O): precise instruction (index into bytecode)
-
-    Slices:
-        start (any/None, R/O): lowerbound
-        stop (any/None, R/O): upperbound
-        step (any/None, R/O): step value
-
-    Complex numbers:
-        real (float, R/O): real part
-        imag (float, R/O): imaginary part
-
-
-Important Modules
-
-                                      sys
-
-                              Some sys variables
-      Variable                                Content
-argv                 The list of command line arguments passed to aPython
-                     script. sys.argv[0] is the script name.
-builtin_module_names A list of strings giving the names of all moduleswritten
-                     in C that are linked into this interpreter.
-check_interval       How often to check for thread switches or signals(measured
-                     in number of virtual machine instructions)
-last_type,           Set only when an exception not handled andinterpreter
-last_value,          prints an error. Used by debuggers.
-last_traceback
-maxint               maximum positive value for integers
-modules              Dictionary of modules that have already been loaded.
-path                 Search path for external modules. Can be modifiedby
-                     program. sys.path[0] == dir of script executing
-platform             The current platform, e.g. "sunos5", "win32"
-ps1, ps2             prompts to use in interactive mode.
-                     File objects used for I/O. One can redirect byassigning a
-stdin, stdout,       new file object to them (or any object:.with a method
-stderr               write(string) for stdout/stderr,.with a method readline()
-                     for stdin)
-version              string containing version info about Python interpreter.
-                     (and also: copyright, dllhandle, exec_prefix, prefix)
-version_info         tuple containing Python version info - (major, minor,
-                     micro, level, serial).
-
-                              Some sys functions
-     Function                                 Result
-exit(n)            Exits with status n. Raises SystemExit exception.(Hence can
-                   be caught and ignored by program)
-getrefcount(object Returns the reference count of the object. Generally one
-)                  higher than you might expect, because of object arg temp
-                   reference.
-setcheckinterval(  Sets the interpreter's thread switching interval (in number
-interval)          of virtual code instructions, default:100).
-settrace(func)     Sets a trace function: called before each line ofcode is
-                   exited.
-setprofile(func)   Sets a profile function for performance profiling.
-                   Info on exception currently being handled; this is atuple
-                   (exc_type, exc_value, exc_traceback).Warning: assigning the
-exc_info()         traceback return value to a local variable in a
-                   function handling an exception will cause a circular
-                   reference.
-setdefaultencoding Change default Unicode encoding - defaults to 7-bit ASCII.
-(encoding)
-getrecursionlimit  Retrieve maximum recursion depth.
-()
-setrecursionlimit  Set maximum recursion depth. (Defaults to 1000.)
-()
-
-
-
-                                      os
-"synonym" for whatever O/S-specific module is proper for current environment.
-this module uses posix whenever possible.
-(see also M.A. Lemburg's utility http://www.lemburg.com/files/python/
-platform.py)
-
-                               Some os variables
-     Variable                                 Meaning
-name                name of O/S-specific module (e.g. "posix", "mac", "nt")
-path                O/S-specific module for path manipulations.
-                    On Unix, os.path.split() <=> posixpath.split()
-curdir              string used to represent current directory ('.')
-pardir              string used to represent parent directory ('..')
-sep                 string used to separate directories ('/' or '\'). Tip: use
-                    os.path.join() to build portable paths.
-altsep              Alternate sep
-if applicable (None
-otherwise)
-pathsep             character used to separate search path components (as in
-                    $PATH), eg. ';' for windows.
-linesep             line separator as used in binary files, ie '\n' on Unix, '\
-                    r\n' on Dos/Win, '\r'
-
-                               Some os functions
-     Function                                 Result
-makedirs(path[,     Recursive directory creation (create required intermediary
-mode=0777])         dirs); os.error if fails.
-removedirs(path)    Recursive directory delete (delete intermediary empty
-                    dirs); if fails.
-renames(old, new)   Recursive directory or file renaming; os.error if fails.
-
-
-
-                                     posix
-don't import this module directly, import os instead !
-(see also module: shutil for file copy & remove fcts)
-
-                            posix Variables
-Variable                             Meaning
-environ  dictionary of environment variables, e.g.posix.environ['HOME'].
-error    exception raised on POSIX-related error.
-         Corresponding value is tuple of errno code and perror() string.
-
-                             Some posix functions
-   Function                                 Result
-chdir(path)     Changes current directory to path.
-chmod(path,     Changes the mode of path to the numeric mode
-mode)
-close(fd)       Closes file descriptor fd opened with posix.open.
-_exit(n)        Immediate exit, with no cleanups, no SystemExit,etc. Should use
-                this to exit a child process.
-execv(p, args)  "Become" executable p with args args
-getcwd()        Returns a string representing the current working directory
-getpid()        Returns the current process id
-fork()          Like C's fork(). Returns 0 to child, child pid to parent.[Not
-                on Windows]
-kill(pid,       Like C's kill [Not on Windows]
-signal)
-listdir(path)   Lists (base)names of entries in directory path, excluding '.'
-                and '..'
-lseek(fd, pos,  Sets current position in file fd to position pos, expressedas
-how)            an offset relative to beginning of file (how=0), tocurrent
-                position (how=1), or to end of file (how=2)
-mkdir(path[,    Creates a directory named path with numeric mode (default 0777)
-mode])
-open(file,      Like C's open(). Returns file descriptor. Use file object
-flags, mode)    fctsrather than this low level ones.
-pipe()          Creates a pipe. Returns pair of file descriptors (r, w) [Not on
-                Windows].
-popen(command,  Opens a pipe to or from command. Result is a file object to
-mode='r',       read to orwrite from, as indicated by mode being 'r' or 'w'.
-bufSize=0)      Use it to catch acommand output ('r' mode) or to feed it ('w'
-                mode).
-remove(path)    See unlink.
-rename(src, dst Renames/moves the file or directory src to dst. [error iftarget
-)               name already exists]
-rmdir(path)     Removes the empty directory path
-read(fd, n)     Reads n bytes from file descriptor fd and return as string.
-                Returns st_mode, st_ino, st_dev, st_nlink, st_uid,st_gid,
-stat(path)      st_size, st_atime, st_mtime, st_ctime.[st_ino, st_uid, st_gid
-                are dummy on Windows]
-system(command) Executes string command in a subshell. Returns exitstatus of
-                subshell (usually 0 means OK).
-                Returns accumulated CPU times in sec (user, system, children's
-times()         user,children's sys, elapsed real time). [3 last not on
-                Windows]
-unlink(path)    Unlinks ("deletes") the file (not dir!) path. same as: remove
-utime(path, (   Sets the access & modified time of the file to the given tuple
-aTime, mTime))  of values.
-wait()          Waits for child process completion. Returns tuple ofpid,
-                exit_status [Not on Windows]
-waitpid(pid,    Waits for process pid to complete. Returns tuple ofpid,
-options)        exit_status [Not on Windows]
-write(fd, str)  Writes str to file fd. Returns nb of bytes written.
-
-
-
-                                   posixpath
-Do not import this module directly, import os instead and refer to this module
-as os.path. (e.g. os.path.exists(p)) !
-
-                           Some posixpath functions
- Function                                 Result
-abspath(p) Returns absolute path for path p, taking current working dir in
-           account.
-dirname/
-basename(p directory and name parts of the path p. See also split.
-)
-exists(p)  True if string p is an existing path (file or directory)
-expanduser Returns string that is (a copy of) p with "~" expansion done.
-(p)
-expandvars Returns string that is (a copy of) p with environment vars expanded.
-(p)        [Windows: case significant; must use Unix: $var notation, not %var%]
-getsize(   return the size in bytes of filename. raise os.error.
-filename)
-getmtime(  return last modification time of filename (integer nb of seconds
-filename)  since epoch).
-getatime(  return last access time of filename (integer nb of seconds since
-filename)  epoch).
-isabs(p)   True if string p is an absolute path.
-isdir(p)   True if string p is a directory.
-islink(p)  True if string p is a symbolic link.
-ismount(p) True if string p is a mount point [true for all dirs on Windows].
-join(p[,q  Joins one or more path components intelligently.
-[,...]])
-           Splits p into (head, tail) where tail is lastpathname component and
-split(p)   <head> is everything leadingup to that. <=> (dirname(p), basename
-           (p))
-splitdrive Splits path p in a pair ('drive:', tail) [Windows]
-(p)
-splitext(p Splits into (root, ext) where last comp of root contains no periods
-)          and ext is empty or startswith a period.
-           Calls the function visit with arguments(arg, dirname, names) for
-           each directory recursively inthe directory tree rooted at p
-walk(p,    (including p itself if it's a dir)The argument dirname specifies the
-visit, arg visited directory, the argumentnames lists the files in the
-)          directory. The visit function maymodify names to influence the set
-           of directories visited belowdirname, e.g., to avoid visiting certain
-           parts of the tree.
-
-
-
-                                    shutil
-high-level file operations (copying, deleting).
-
-                             Main shutil functions
-     Function                                 Result
-copy(src, dst)     Copies the contents of file src to file dst, retaining file
-                   permissions.
-copytree(src, dst  Recursively copies an entire directory tree rooted at src
-[, symlinks])      into dst (which should not already exist). If symlinks is
-                   true, links insrc are kept as such in dst.
-rmtree(path[,      Deletes an entire directory tree, ignoring errors if
-ignore_errors[,    ignore_errors true,or calling onerror(func, path,
-onerror]])         sys.exc_info()) if supplied with
-
-(and also: copyfile, copymode, copystat, copy2)
-
-time
-
-                                  Variables
-Variable                               Meaning
-altzone  signed offset of local DST timezone in sec west of the 0th meridian.
-daylight nonzero if a DST timezone is specified
-
-                                   Functions
-  Function                                 Result
-time()        return a float representing UTC time in seconds since the epoch.
-gmtime(secs), return a tuple representing time : (year aaaa, month(1-12),day
-localtime(    (1-31), hour(0-23), minute(0-59), second(0-59), weekday(0-6, 0 is
-secs)         monday), Julian day(1-366), daylight flag(-1,0 or 1))
-asctime(
-timeTuple),
-strftime(
-format,       return a formatted string representing time.
-timeTuple)
-mktime(tuple) inverse of localtime(). Return a float.
-strptime(     parse a formatted string representing time, return tuple as in
-string[,      gmtime().
-format])
-sleep(secs)   Suspend execution for <secs> seconds. <secs> can be a float.
-
-and also: clock, ctime.
-
-                                    string
-
-As of Python 2.0, much (though not all) of the functionality provided by the
-string module have been superseded by built-in string methods - see Operations
-on strings for details.
-
-                             Some string variables
-              Variable                                Meaning
-digits                               The string '0123456789'
-hexdigits, octdigits                 legal hexadecimal & octal digits
-letters, uppercase, lowercase,       Strings containing the appropriate
-whitespace                           characters
-index_error                          Exception raised by index() if substr not
-                                     found.
-
-                             Some string functions
-     Function                                 Result
-expandtabs(s,      returns a copy of string <s> with tabs expanded.
-tabSize)
-find/rfind(s, sub  Return the lowest/highest index in <s> where the substring
-[, start=0[, end=  <sub> is found such that <sub> is wholly contained ins
-0])                [start:end]. Return -1 if <sub> not found.
-ljust/rjust/center Return a copy of string <s> left/right justified/centerd in
-(s, width)         afield of given width, padded with spaces. <s> is
-                   nevertruncated.
-lower/upper(s)     Return a string that is (a copy of) <s> in lowercase/
-                   uppercase
-split(s[, sep=     Return a list containing the words of the string <s>,using
-whitespace[,       the string <sep> as a separator.
-maxsplit=0]])
-join(words[, sep=' Concatenate a list or tuple of words with
-'])                interveningseparators; inverse of split.
-replace(s, old,    Returns a copy of string <s> with all occurrences of
-new[, maxsplit=0]  substring<old> replaced by <new>. Limits to <maxsplit>
-                   firstsubstitutions if specified.
-strip(s)           Return a string that is (a copy of) <s> without leadingand
-                   trailing whitespace. see also lstrip, rstrip.
-
-
-
-                                   re (sre)
-
-Handles Unicode strings. Implemented in new module sre, re now a mere front-end
-for compatibility.
-Patterns are specified as strings. Tip: Use raw strings (e.g. r'\w*') to
-litteralize backslashes.
-
-
-                           Regular expression syntax
-   Form                                Description
-.          matches any character (including newline if DOTALL flag specified)
-^          matches start of the string (of every line in MULTILINE mode)
-$          matches end of the string (of every line in MULTILINE mode)
-*          0 or more of preceding regular expression (as many as possible)
-+          1 or more of preceding regular expression (as many as possible)
-?          0 or 1 occurrence of preceding regular expression
-*?, +?, ?? Same as *, + and ? but matches as few characters as possible
-{m,n}      matches from m to n repetitions of preceding RE
-{m,n}?     idem, attempting to match as few repetitions as possible
-[ ]        defines character set: e.g. '[a-zA-Z]' to match all letters(see also
-           \w \S)
-[^ ]       defines complemented character set: matches if char is NOT in set
-           escapes special chars '*?+&$|()' and introduces special sequences
-\          (see below). Due to Python string rules, write as '\\' orr'\' in the
-           pattern string.
-\\         matches a litteral '\'; due to Python string rules, write as '\\\\
-           'in pattern string, or better using raw string: r'\\'.
-|          specifies alternative: 'foo|bar' matches 'foo' or 'bar'
-(...)      matches any RE inside (), and delimits a group.
-(?:...)    idem but doesn't delimit a group.
-           matches if ... matches next, but doesn't consume any of the string
-(?=...)    e.g. 'Isaac (?=Asimov)' matches 'Isaac' only if followed by
-           'Asimov'.
-(?!...)    matches if ... doesn't match next. Negative of (?=...)
-(?P<name   matches any RE inside (), and delimits a named group. (e.g. r'(?P
->...)      <id>[a-zA-Z_]\w*)' defines a group named id)
-(?P=name)  matches whatever text was matched by the earlier group named name.
-(?#...)    A comment; ignored.
-(?letter)  letter is one of 'i','L', 'm', 's', 'x'. Set the corresponding flags
-           (re.I, re.L, re.M, re.S, re.X) for the entire RE.
-
-                               Special sequences
-Sequence                              Description
-number   matches content of the group of the same number; groups are numbered
-         starting from 1
-\A       matches only at the start of the string
-\b       empty str at beg or end of word: '\bis\b' matches 'is', but not 'his'
-\B       empty str NOT at beginning or end of word
-\d       any decimal digit (<=> [0-9])
-\D       any non-decimal digit char (<=> [^O-9])
-\s       any whitespace char (<=> [ \t\n\r\f\v])
-\S       any non-whitespace char (<=> [^ \t\n\r\f\v])
-\w       any alphaNumeric char (depends on LOCALE flag)
-\W       any non-alphaNumeric char (depends on LOCALE flag)
-\Z       matches only at the end of the string
-
-                         Variables
-Variable                       Meaning
-error    Exception when pattern string isn't a valid regexp.
-
-                                   Functions
-   Function                                 Result
-               Compile a RE pattern string into a regular expression object.
-               Flags (combinable by |):
-
-               I or IGNORECASE or (?i)
-                   case insensitive matching
-compile(       L or LOCALE or (?L)
-pattern[,          make \w, \W, \b, \B dependent on thecurrent locale
-flags=0])      M or MULTILINE or (?m)
-                   matches every new line and not onlystart/end of the whole
-                   string
-               S or DOTALL or (?s)
-                   '.' matches ALL chars, including newline
-               X or VERBOSE or (?x)
-                   Ignores whitespace outside character sets
-escape(string) return (a copy of) string with all non-alphanumerics
-               backslashed.
-match(pattern, if 0 or more chars at beginning of <string> match the RE pattern
-string[, flags string,return a corresponding MatchObject instance, or None if
-])             no match.
-search(pattern scan thru <string> for a location matching <pattern>, return
-, string[,     acorresponding MatchObject instance, or None if no match.
-flags])
-split(pattern, split <string> by occurrences of <pattern>. If capturing () are
-string[,       used inpattern, then occurrences of patterns or subpatterns are
-maxsplit=0])   also returned.
-findall(       return a list of non-overlapping matches in <pattern>, either a
-pattern,       list ofgroups or a list of tuples if the pattern has more than 1
-string)        group.
-               return string obtained by replacing the (<count> first) lefmost
-sub(pattern,   non-overlapping occurrences of <pattern> (a string or a RE
-repl, string[, object) in <string>by <repl>; <repl> can be a string or a fct
-count=0])      called with a single MatchObj arg, which must return the
-               replacement string.
-subn(pattern,
-repl, string[, same as sub(), but returns a tuple (newString, numberOfSubsMade)
-count=0])
-
-Regular Expression Objects
-
-
-(RE objects are returned by the compile fct)
-
-                          re object attributes
-Attribute                            Descrition
-flags      flags arg used when RE obj was compiled, or 0 if none provided
-groupindex dictionary of {group name: group number} in pattern
-pattern    pattern string from which RE obj was compiled
-
-                               re object methods
-  Method                                  Result
-            If zero or more characters at the beginning of string match this
-            regular expression, return a corresponding MatchObject instance.
-            Return None if the string does not match the pattern; note that
-            this is different from a zero-length match.
-            The optional second parameter pos gives an index in the string
-match(      where the search is to start; it defaults to 0. This is not
-string[,    completely equivalent to slicing the string; the '' pattern
-pos][,      character matches at the real beginning of the string and at
-endpos])    positions just after a newline, but not necessarily at the index
-            where the search is to start.
-            The optional parameter endpos limits how far the string will be
-            searched; it will be as if the string is endpos characters long, so
-            only the characters from pos to endpos will be searched for a
-            match.
-            Scan through string looking for a location where this regular
-search(     expression produces a match, and return a corresponding MatchObject
-string[,    instance. Return None if no position in the string matches the
-pos][,      pattern; note that this is different from finding a zero-length
-endpos])    match at some point in the string.
-            The optional pos and endpos parameters have the same meaning as for
-            the match() method.
-split(
-string[,    Identical to the split() function, using the compiled pattern.
-maxsplit=
-0])
-findall(    Identical to the findall() function, using the compiled pattern.
-string)
-sub(repl,
-string[,    Identical to the sub() function, using the compiled pattern.
-count=0])
-subn(repl,
-string[,    Identical to the subn() function, using the compiled pattern.
-count=0])
-
-Match Objects
-
-
-(Match objects are returned by the match & search functions)
-
-                            Match object attributes
-Attribute                              Description
-pos       value of pos passed to search or match functions; index intostring at
-          which RE engine started search.
-endpos    value of endpos passed to search or match functions; index intostring
-          beyond which RE engine won't go.
-re        RE object whose match or search fct produced this MatchObj instance
-string    string passed to match() or search()
-
-                            Match object functions
-Function                                 Result
-          returns one or more groups of the match. If one arg, result is a
-group([g1 string;if multiple args, result is a tuple with one item per arg. If
-, g2,     gi is 0,return value is entire matching string; if 1 <= gi <= 99,
-...])     returnstring matching group #gi (or None if no such group); gi may
-          also bea group name.
-          returns a tuple of all groups of the match; groups not
-groups()  participatingto the match have a value of None. Returns a string
-          instead of tupleif len(tuple)=1
-start(
-group),   returns indices of start & end of substring matched by group (or
-end(group Noneif group exists but doesn't contribute to the match)
-)
-span(     returns the 2-tuple (start(group), end(group)); can be (None, None)if
-group)    group didn't contibute to the match.
-
-
-
-                                     math
-
-Variables:
-pi
-e
-Functions (see ordinary C man pages for info):
-acos(x)
-asin(x)
-atan(x)
-atan2(x, y)
-ceil(x)
-cos(x)
-cosh(x)
-degrees(x)
-exp(x)
-fabs(x)
-floor(x)
-fmod(x, y)
-frexp(x)        -- Unlike C: (float, int) = frexp(float)
-ldexp(x, y)
-log(x [,base])
-log10(x)
-modf(x)         -- Unlike C: (float, float) = modf(float)
-pow(x, y)
-radians(x)
-sin(x)
-sinh(x)
-sqrt(x)
-tan(x)
-tanh(x)
-
-                                    getopt
-
-Functions:
-getopt(list, optstr)    -- Similar to C. <optstr> is option
-                           letters to look for. Put ':' after letter
-                           if option takes arg. E.g.
-    # invocation was "python test.py -c hi -a arg1 arg2"
-       opts, args =  getopt.getopt(sys.argv[1:], 'ab:c:')
-    # opts would be
-       [('-c', 'hi'), ('-a', '')]
-    # args would be
-       ['arg1', 'arg2']
-
-
-List of modules and packages in base distribution
-
-(built-ins and content of python Lib directory)
-(Python NT distribution, may be slightly different in other distributions)
-
-                           Standard library modules
-   Operation                                 Result
-aifc             Stuff to parse AIFF-C and AIFF files.
-asynchat         Support for 'chat' style protocols
-asyncore         Asynchronous File I/O (in select style)
-atexit           Register functions to be called at exit of Python interpreter.
-base64           Conversions to/from base64 RFC-MIME transport encoding .
-bdb              A generic Python debugger base class.
-binhex           Macintosh binhex compression/decompression.
-bisect           List bisection algorithms.
-bz2              Support for bz2 compression/decompression.
-calendar         Calendar printing functions.
-cgi              Wraps the WWW Forms Common Gateway Interface (CGI).
-cgitb            Utility for handling CGI tracebacks.
-cmd              A generic class to build line-oriented command interpreters.
-datetime         Basic date and time types.
-code             Utilities needed to emulate Python's interactive interpreter
-codecs           Lookup existing Unicode encodings and register new ones.
-colorsys         Conversion functions between RGB and other color systems.
-compileall       Force "compilation" of all .py files in a directory.
-configparser     Configuration file parser (much like windows .ini files)
-copy             Generic shallow and deep copying operations.
-copyreg          Helper to provide extensibility for pickle/cPickle.
-csv              Read and write files with comma separated values.
-dbm              Generic interface to all dbm clones (dbm.bsd, dbm.gnu,
-                 dbm.ndbm, dbm.dumb).
-dircache         Sorted list of files in a dir, using a cache.
-difflib          Tool for creating delta between sequences.
-dis              Bytecode disassembler.
-distutils        Package installation system.
-doctest          Tool for running and verifying tests inside doc strings.
-dospath          Common operations on DOS pathnames.
-email            Comprehensive support for internet email.
-filecmp          File comparison.
-fileinput        Helper class to quickly write a loop over all standard input
-                 files.
-fnmatch          Filename matching with shell patterns.
-formatter        A test formatter.
-fpformat         General floating point formatting functions.
-ftplib           An FTP client class. Based on RFC 959.
-gc               Perform garbacge collection, obtain GC debug stats, and tune
-                 GC parameters.
-getopt           Standard command line processing. See also ftp://
-                 www.pauahtun.org/pub/getargspy.zip
-getpass          Utilities to get a password and/or the current user name.
-glob             filename globbing.
-gzip             Read & write gzipped files.
-heapq            Priority queue implemented using lists organized as heaps.
-hmac             Keyed-Hashing for Message Authentication -- RFC 2104.
-html.entities    HTML entity definitions.
-html.parser      A parser for HTML and XHTML.
-http.client      HTTP client class.
-http.server      HTTP server services.
-ihooks           Hooks into the "import" mechanism.
-imaplib          IMAP4 client.Based on RFC 2060.
-imghdr           Recognizing image files based on their first few bytes.
-imputil          Privides a way of writing customised import hooks.
-inspect          Tool for probing live Python objects.
-keyword          List of Python keywords.
-linecache        Cache lines from files.
-locale           Support for number formatting using the current locale
-                 settings.
-logging          Python logging facility.
-macpath          Pathname (or related) operations for the Macintosh.
-macurl2path      Mac specific module for conversion between pathnames and URLs.
-mailbox          A class to handle a unix-style or mmdf-style mailbox.
-mailcap          Mailcap file handling (RFC 1524).
-mhlib            MH (mailbox) interface.
-mimetypes        Guess the MIME type of a file.
-mmap             Interface to memory-mapped files - they behave like mutable
-                 strings./font>
-multifile        Class to make multi-file messages easier to handle.
-mutex            Mutual exclusion -- for use with module sched.
-netrc
-nntplib          An NNTP client class. Based on RFC 977.
-ntpath           Common operations on DOS pathnames.
-nturl2path       Mac specific module for conversion between pathnames and URLs.
-optparse         A comprehensive tool for processing command line options.
-os               Either mac, dos or posix depending system.
-pdb              A Python debugger.
-pickle           Pickling (save and restore) of Python objects (a faster
-                 Cimplementation exists in built-in module: cPickle).
-pipes            Conversion pipeline templates.
-pkgunil          Utilities for working with Python packages.
-poplib           A POP3 client class. Based on the J. Myers POP3 draft.
-posixpath        Common operations on POSIX pathnames.
-pprint           Support to pretty-print lists, tuples, & dictionaries
-                 recursively.
-profile          Class for profiling python code.
-pstats           Class for printing reports on profiled python code.
-pydoc            Utility for generating documentation from source files.
-pty              Pseudo terminal utilities.
-pyexpat          Interface to the Expay XML parser.
-py_compile       Routine to "compile" a .py file to a .pyc file.
-pyclbr           Parse a Python file and retrieve classes and methods.
-queue            A multi-producer, multi-consumer queue.
-quopri           Conversions to/from quoted-printable transport encoding.
-random           Random variable generators
-re               Regular Expressions.
-reprlib          Redo repr() but with limits on most sizes.
-rlcompleter      Word completion for GNU readline 2.0.
-sched            A generally useful event scheduler class.
-shelve           Manage shelves of pickled objects.
-shlex            Lexical analyzer class for simple shell-like syntaxes.
-shutil           Utility functions usable in a shell-like program.
-site             Append module search paths for third-party packages to
-                 sys.path.
-smtplib          SMTP Client class (RFC 821)
-sndhdr           Several routines that help recognizing sound.
-socketserver     Generic socket server classes.
-stat             Constants and functions for interpreting stat/lstat struct.
-statvfs          Constants for interpreting statvfs struct as returned by
-                 os.statvfs()and os.fstatvfs() (if they exist).
-string           A collection of string operations.
-sunau            Stuff to parse Sun and NeXT audio files.
-sunaudio         Interpret sun audio headers.
-symbol           Non-terminal symbols of Python grammar (from "graminit.h").
-tabnanny         Check Python source for ambiguous indentation.
-tarfile          Facility for reading and writing to the *nix tarfile format.
-telnetlib        TELNET client class. Based on RFC 854.
-tempfile         Temporary file name allocation.
-textwrap         Object for wrapping and filling text.
-threading        Proposed new higher-level threading interfaces
-token            Tokens (from "token.h").
-tokenize         Compiles a regular expression that recognizes Python tokens.
-traceback        Format and print Python stack traces.
-tty              Terminal utilities.
-turtle           LogoMation-like turtle graphics
-types            Define names for all type symbols in the std interpreter.
-tzparse          Parse a timezone specification.
-unicodedata      Interface to unicode properties.
-urllib.parse     Parse URLs according to latest draft of standard.
-urllib.request   Open an arbitrary URL.
-urllib.robotparser  Parse robots.txt files, useful for web spiders.
-user             Hook to allow user-specified customization code to run.
-uu               UUencode/UUdecode.
-unittest         Utilities for implementing unit testing.
-wave             Stuff to parse WAVE files.
-weakref          Tools for creating and managing weakly referenced objects.
-webbrowser       Platform independent URL launcher.
-xdrlib           Implements (a subset of) Sun XDR (eXternal Data
-                 Representation).
-xml.dom          Classes for processing XML using the Document Object Model.
-xml.sax          Classes for processing XML using the SAX API.
-xmlrpc.client    Support for remote procedure calls using XML.
-xmlrpc.server    Create XMLRPC servers.
-zipfile          Read & write PK zipped files.
-
-
-
-* Built-ins *
-
-            sys                 Interpreter state vars and functions
-            __built-in__        Access to all built-in python identifiers
-            __main__            Scope of the interpreters main program, script or stdin
-            array               Obj efficiently representing arrays of basic values
-            math                Math functions of C standard
-            time                Time-related functions (also the newer datetime module)
-            marshal             Read and write some python values in binary format
-            struct              Convert between python values and C structs
-
-* Standard *
-
-            getopt              Parse cmd line args in sys.argv.  A la UNIX 'getopt'.
-            os                  A more portable interface to OS dependent functionality
-            re                  Functions useful for working with regular expressions
-            string              Useful string and characters functions and exceptions
-            random              Mersenne Twister pseudo-random number generator
-            _thread             Low-level primitives for working with process threads
-            threading           idem, new recommended interface.
-
-* Unix/Posix *
-
-            dbm                 Interface to Unix dbm databases
-            grp                 Interface to Unix group database
-            posix               OS functionality standardized by C and POSIX standards
-            posixpath           POSIX pathname functions
-            pwd                 Access to the Unix password database
-            select              Access to Unix select multiplex file synchronization
-            socket              Access to BSD socket interface
-
-* Tk User-interface Toolkit *
-
-            tkinter             Main interface to Tk
-
-* Multimedia *
-
-            audioop             Useful operations on sound fragments
-            imageop             Useful operations on images
-            jpeg                Access to jpeg image compressor and decompressor
-            rgbimg              Access SGI imglib image files
-
-* Cryptographic Extensions *
-
-            md5         Interface to RSA's MD5 message digest algorithm
-            sha         Interface to the SHA message digest algorithm
-            HMAC        Keyed-Hashing for Message Authentication -- RFC 2104.
-
-* SGI IRIX * (4 & 5)
-
-            al          SGI audio facilities
-            AL          al constants
-            fl          Interface to FORMS library
-            FL          fl constants
-            flp Functions for form designer
-            fm          Access to font manager library
-            gl          Access to graphics library
-            GL          Constants for gl
-            DEVICE      More constants for gl
-            imgfile     Imglib image file interface
-
-
-Workspace exploration and idiom hints
-
-        dir(<module>)   list functions, variables in <module>
-        dir()           get object keys, defaults to local name space
-        if __name__ == '__main__': main()            invoke main if running as script
-        map(None, lst1, lst2, ...)                   merge lists
-        b = a[:]                                     create copy of seq structure
-        _                       in interactive mode, is last value printed
-
-
-
-
-
-
-
-Python Mode for Emacs
-
-(Not revised, possibly not up to date)
-Type C-c ? when in python-mode for extensive help.
-INDENTATION
-Primarily for entering new code:
-        TAB      indent line appropriately
-        LFD      insert newline, then indent
-        DEL      reduce indentation, or delete single character
-Primarily for reindenting existing code:
-        C-c :    guess py-indent-offset from file content; change locally
-        C-u C-c :        ditto, but change globally
-        C-c TAB  reindent region to match its context
-        C-c <    shift region left by py-indent-offset
-        C-c >    shift region right by py-indent-offset
-MARKING & MANIPULATING REGIONS OF CODE
-C-c C-b         mark block of lines
-M-C-h           mark smallest enclosing def
-C-u M-C-h       mark smallest enclosing class
-C-c #           comment out region of code
-C-u C-c #       uncomment region of code
-MOVING POINT
-C-c C-p         move to statement preceding point
-C-c C-n         move to statement following point
-C-c C-u         move up to start of current block
-M-C-a           move to start of def
-C-u M-C-a       move to start of class
-M-C-e           move to end of def
-C-u M-C-e       move to end of class
-EXECUTING PYTHON CODE
-C-c C-c sends the entire buffer to the Python interpreter
-C-c |   sends the current region
-C-c !   starts a Python interpreter window; this will be used by
-        subsequent C-c C-c or C-c | commands
-C-c C-w runs PyChecker
-
-VARIABLES
-py-indent-offset        indentation increment
-py-block-comment-prefix comment string used by py-comment-region
-py-python-command       shell command to invoke Python interpreter
-py-scroll-process-buffer        t means always scroll Python process buffer
-py-temp-directory       directory used for temp files (if needed)
-py-beep-if-tab-change   ring the bell if tab-width is changed
-
-
-The Python Debugger
-
-(Not revised, possibly not up to date, see 1.5.2 Library Ref section 9.1; in 1.5.2, you may also use debugger integrated in IDLE)
-
-Accessing
-
-import pdb      (it's a module written in Python)
-        -- defines functions :
-           run(statement[,globals[, locals]])
-                        -- execute statement string under debugger control, with optional
-                           global & local environment.
-           runeval(expression[,globals[, locals]])
-                        -- same as run, but evaluate expression and return value.
-           runcall(function[, argument, ...])
-                        -- run function object with given arg(s)
-           pm()         -- run postmortem on last exception (like debugging a core file)
-           post_mortem(t)
-                        -- run postmortem on traceback object <t>
-
-        -- defines class Pdb :
-           use Pdb to create reusable debugger objects. Object
-           preserves state (i.e. break points) between calls.
-
-        runs until a breakpoint hit, exception, or end of program
-        If exception, variable '__exception__' holds (exception,value).
-
-Commands
-
-h, help
-        brief reminder of commands
-b, break [<arg>]
-        if <arg> numeric, break at line <arg> in current file
-        if <arg> is function object, break on entry to fcn <arg>
-        if no arg, list breakpoints
-cl, clear [<arg>]
-        if <arg> numeric, clear breakpoint at <arg> in current file
-        if no arg, clear all breakpoints after confirmation
-w, where
-        print current call stack
-u, up
-        move up one stack frame (to top-level caller)
-d, down
-        move down one stack frame
-s, step
-        advance one line in the program, stepping into calls
-n, next
-        advance one line, stepping over calls
-r, return
-        continue execution until current function returns
-        (return value is saved in variable "__return__", which
-        can be printed or manipulated from debugger)
-c, continue
-        continue until next breakpoint
-j, jump lineno
-        Set the next line that will be executed
-a, args
-        print args to current function
-rv, retval
-        prints return value from last function that returned
-p, print <arg>
-        prints value of <arg> in current stack frame
-l, list [<first> [, <last>]]
-               List source code for the current file.
-               Without arguments, list 11 lines around the current line
-               or continue the previous listing.
-               With one argument, list 11 lines starting at that line.
-               With two arguments, list the given range;
-               if the second argument is less than the first, it is a count.
-whatis <arg>
-        prints type of <arg>
-!
-        executes rest of line as a Python statement in the current stack frame
-q quit
-        immediately stop execution and leave debugger
-<return>
-        executes last command again
-Any input debugger doesn't recognize as a command is assumed to be a
-Python statement to execute in the current stack frame, the same way
-the exclamation mark ("!") command does.
-
-Example
-
-(1394) python
-Python 1.0.3 (Sep 26 1994)
-Copyright 1991-1994 Stichting Mathematisch Centrum, Amsterdam
->>> import rm
->>> rm.run()
-Traceback (innermost last):
-         File "<stdin>", line 1
-         File "./rm.py", line 7
-           x = div(3)
-         File "./rm.py", line 2
-           return a / r
-ZeroDivisionError: integer division or modulo
->>> import pdb
->>> pdb.pm()
-> ./rm.py(2)div: return a / r
-(Pdb) list
-         1     def div(a):
-         2  ->     return a / r
-         3
-         4     def run():
-         5         global r
-         6         r = 0
-         7         x = div(3)
-         8         print x
-[EOF]
-(Pdb) print r
-0
-(Pdb) q
->>> pdb.runcall(rm.run)
-etc.
-
-Quirks
-
-Breakpoints are stored as filename, line number tuples. If a module is reloaded
-after editing, any remembered breakpoints are likely to be wrong.
-
-Always single-steps through top-most stack frame. That is, "c" acts like "n".
diff --git a/Misc/developers.txt b/Misc/developers.txt
deleted file mode 100644
index 0c34613bb0..0000000000
--- a/Misc/developers.txt
+++ /dev/null
@@ -1,346 +0,0 @@
-Developer Log
-=============
-
-This file is a running log of developers given permissions on SourceForge.
-
-The purpose is to provide some institutional memory of who was given access
-and why.
-
-The first entry starts in April 2005.  In keeping with the style of
-Misc/NEWS, newer entries should be added to the top.  Any markup should
-be in the form of ReST.  Entries should include the initials of the
-project admin who made the change or granted access.  Feel free to revise
-the format to accommodate documentation needs as they arise.
-
-Note, when giving new commit permissions, be sure to get a contributor
-agreement from the committer.  See http://www.python.org/psf/contrib/
-for details.  When the agreement is signed, please note it in this log.
-
-This file is encoded in UTF-8.  If the usual form for a name is not in
-a Latin or extended Latin alphabet, make sure to include an ASCII
-transliteration too.
-
-Permissions History
--------------------
-
-- David Malcolm was given commit access on Oct 27 2010 by GFB,
-  at recommendation by Antoine Pitrou and Raymond Hettinger.
-
-- Tal Einat was given commit access on Oct 4 2010 by MvL,
-  for improving IDLE.
-
-- Łukasz Langa was given commit access on Sep 08 2010 by GFB,
-  at suggestion of Antoine Pitrou, for general bug fixing.
-
-- Daniel Stutzbach was given commit access on Aug 22 2010 by MvL,
-  for general bug fixing.
-
-- Ask Solem was given commit access on Aug 17 2010 by MvL,
-  on recommendation by Jesse Noller, for work on the multiprocessing
-  library.
-
-- George Boutsioukis was given commit access on Aug 10 2010
-  by MvL, for work on 2to3.
-
-- Éric Araujo was given commit access on Aug 10 2010 by BAC,
-  at suggestion of Tarek Ziadé.
-
-- Terry Reedy was given commit access on Aug 04 2010 by MvL,
-  at suggestion of Nick Coghlan.
-
-- Brian Quinlan was given commit access on Jul 26 2010 by GFB,
-  for work related to PEP 3148.
-
-- Reid Kleckner was given commit access on Jul 11 2010 by GFB,
-  for work on the py3k-jit branch, at suggestion of the Unladen
-  Swallow team.
-
-- Alexander Belopolsky was given commit access on May 25 2010
-  by MvL at suggestion of Mark Dickinson.
-
-- Tim Golden was given commit access on April 21 2010 by MvL,
-  at suggestion of Michael Foord.
-
-- Giampaolo Rodolà was given commit access on April 17 2010 by
-  MvL, at suggestion of R. David Murray.
-
-- Jean-Paul Calderone was given commit access on April 6 2010 by
-  GFB, at suggestion of Michael Foord and others.
-
-- Brian Curtin was given commit access on March 24 2010 by MvL.
-
-- Florent Xicluna was given commit access on February 25 2010 by
-  MvL, based on Antoine Pitrou's recommendation.
-
-- Dino Viehland was given SVN access on February 23 2010 by Brett
-  Cannon, for backporting tests from IronPython.
-
-- Larry Hastings was given SVN access on February 22 2010 by
-  Andrew Kuchling, based on Brett Cannon's recommendation.
-
-- Victor Stinner was given SVN access on January 30 2010 by MvL,
-  at recommendation by Mark Dickinson and Amaury Forgeot d'Arc.
-
-- Stefan Krah was given SVN access on January 5 2010 by GFB, at
-  suggestion of Mark Dickinson, for work on the decimal module.
-
-- Doug Hellmann was given SVN access on September 19 2009 by GFB, at
-  suggestion of Jesse Noller, for documentation work.
-
-- Ezio Melotti was given SVN access on June 7 2009 by GFB, for work on and
-  fixes to the documentation.
-
-- Paul Kippes was given commit privileges at PyCon 2009 by BAC to work on 3to2.
-
-- Ron DuPlain was given commit privileges at PyCon 2009 by BAC to work on 3to2.
-
-- Several developers of alternative Python implementations where
-  given access for test suite and library adaptions by MvL:
-  Allison Randal (Parrot), Michael Foord (IronPython),
-  Jim Baker, Philip Jenvey, and Frank Wierzbicki (all Jython).
-
-- R. David Murray was given SVN access on March 30 2009 by MvL, after
-  recommendation by BAC.
-
-- Chris Withers was given SVN access on March 8 2009 by MvL,
-  after recommendation by GvR.
-
-- Tarek Ziadé was given SVN access on December 21 2008 by NCN,
-  for maintenance of distutils.
-
-- Hirokazu Yamamoto was given SVN access on August 12 2008 by MvL,
-  for contributions to the Windows build.
-
-- Antoine Pitrou was given SVN access on July 16 2008, by recommendation
-  from GvR, for general contributions to Python.
-
-- Jesse Noller was given SVN access on 16 June 2008 by GFB,
-  for work on the multiprocessing module.
-
-- Gregor Lingl was given SVN access on 10 June 2008 by MvL,
-  for work on the turtle module.
-
-- Robert Schuppenies was given SVN access on 21 May 2008 by MvL,
-  for GSoC contributions.
-
-- Rodrigo Bernardo Pimentel was given SVN access on 29 April 2008 by MvL,
-  for GSoC contributions.
-
-- Heiko Weinen was given SVN access on 29 April 2008 by MvL,
-  for GSoC contributions.
-
-- Jesus Cea was given SVN access on 24 April 2008 by MvL,
-  for maintenance of bsddb.
-
-- Guilherme Polo was given SVN access on 24 April 2008 by MvL,
-  for GSoC contributions.
-
-- Thomas Lee was given SVN access on 21 April 2008 by NCN,
-  for work on branches (ast/optimizer related).
-
-- Jeroen Ruigrok van der Werven was given SVN access on 12 April 2008
-  by GFB, for documentation work.
-
-- Josiah Carlson was given SVN access on 26 March 2008 by GFB,
-  for work on asyncore/asynchat.
-
-- Benjamin Peterson was given SVN access on 25 March 2008 by GFB,
-  for bug triage work.
-
-- Jerry Seutter was given SVN access on 20 March 2008 by BAC, for
-  general contributions to Python.
-
-- Jeff Rush was given SVN access on 18 March 2008 by AMK, for Distutils work.
-
-- David Wolever was given SVN access on 17 March 2008 by MvL,
-  for 2to3 work.
-
-- Trent Nelson was given SVN access on 17 March 2008 by MvL,
-  for general contributions to Python.
-
-- Mark Dickinson was given SVN access on 6 January 2008 by Facundo
-  Batista for his work on mathemathics and number related issues.
-
-- Amaury Forgeot d'Arc was given SVN access on 9 November 2007 by MvL,
-  for general contributions to Python.
-
-- Christian Heimes was given SVN access on 31 October 2007 by MvL,
-  for general contributions to Python.
-
-- Chris Monson was given SVN access on 20 October 2007 by NCN,
-  for his work on editing PEPs.
-
-- Bill Janssen was given SVN access on 28 August 2007 by NCN,
-  for his work on the SSL module and other things related to (SSL) sockets.
-
-- Jeffrey Yasskin was given SVN access on 9 August 2007 by NCN,
-  for his work on PEPs and other general patches.
-
-- Mark Summerfield was given SVN access on 1 August 2007 by GFB,
-  for work on documentation.
-
-- Armin Ronacher was given SVN access on 23 July 2007 by GFB,
-  for work on the documentation toolset.  He now maintains the
-  ast module.
-
-- Senthil Kumaran was given SVN access on 16 June 2007 by MvL,
-  for his Summer-of-Code project, mentored by Skip Montanaro.
-
-- Alexandre Vassalotti was given SVN access on 21 May 2007 by MvL,
-  for his Summer-of-Code project, mentored by Brett Cannon.
-
-- Travis Oliphant was given SVN access on 17 Apr 2007 by MvL,
-  for implementing the extended buffer protocol.
-
-- Ziga Seilnacht was given SVN access on 09 Mar 2007 by MvL,
-  for general maintenance.
-
-- Pete Shinners was given SVN access on 04 Mar 2007 by NCN,
-  for PEP 3101 work in the sandbox.
-
-- Pat Maupin and Eric V. Smith were given SVN access on 28 Feb 2007 by NCN,
-  for PEP 3101 work in the sandbox.
-
-- Steven Bethard (SF name "bediviere") added to the SourceForge Python
-  project 26 Feb 2007, by NCN, as a tracker tech.
-
-- Josiah Carlson (SF name "josiahcarlson") added to the SourceForge Python
-  project 06 Jan 2007, by NCN, as a tracker tech.  He will maintain asyncore.
-
-- Collin Winter was given SVN access on 05 Jan 2007 by NCN, for PEP
-  update access.
-
-- Lars Gustaebel was given SVN access on 20 Dec 2006 by NCN, for tarfile.py
-  related work.
-
-- 2006 Summer of Code entries: SoC developers are expected to work
-  primarily in nondist/sandbox or on a branch of their own, and will
-  have their work reviewed before changes are accepted into the trunk.
-
-  - Matt Fleming was added on 25 May 2006 by AMK; he'll be working on
-    enhancing the Python debugger.
-
-  - Jackilyn Hoxworth was added on 25 May 2006 by AMK; she'll be adding logging
-    to the standard library.
-
-  - Mateusz Rukowicz was added on 30 May 2006 by AMK; he'll be
-    translating the decimal module into C.
-
-- SVN access granted to the "Need for Speed" Iceland sprint attendees,
-  between May 17 and 21, 2006, by Tim Peters.  All work is to be done
-  in new sandbox projects or on new branches, with merging to the
-  trunk as approved:
-
-  Andrew Dalke
-  Christian Tismer
-  Jack Diederich
-  John Benediktsson
-  Kristján V. Jónsson
-  Martin Blais
-  Richard Emslie
-  Richard Jones
-  Runar Petursson
-  Steve Holden
-  Richard M. Tew
-
-- Steven Bethard was given SVN access on 27 Apr 2006 by DJG, for PEP
-  update access.
-
-- Talin was given SVN access on 27 Apr 2006 by DJG, for PEP update
-  access.
-
-- George Yoshida (SF name "quiver") added to the SourceForge Python
-  project 14 Apr 2006, by Tim Peters, as a tracker admin.  See
-  contemporaneous python-checkins thread with the unlikely Subject:
-
-      r45329 - python/trunk/Doc/whatsnew/whatsnew25.tex
-
-- Ronald Oussoren was given SVN access on 3 Mar 2006 by NCN, for Mac
-  related work.
-
-- Bob Ippolito was given SVN access on 2 Mar 2006 by NCN, for Mac
-  related work.
-
-- Nick Coghlan requested CVS access so he could update his PEP directly.
-  Granted by GvR on 16 Oct 2005.
-
-- Added two new developers for the Summer of Code project. 8 July 2005
-  by RDH.  Andrew Kuchling will be mentoring Gregory K Johnson for a
-  project to enhance mailbox.  Brett Cannon requested access for Flovis
-  Bruynooghe (sirolf) to work on pstats, profile, and hotshot.  Both users
-  are expected to work primarily in nondist/sandbox and have their work
-  reviewed before making updates to active code.
-
-- Georg Brandl was given SF tracker permissions on 28 May 2005
-  by RDH.  Since the beginning of 2005, he has been active in discussions
-  on python-dev and has submitted a dozen patch reviews.  The permissions
-  add the ability to change tracker status and to attach patches.  On
-  3 June 2005, this was expanded by RDH to include checkin permissions.
-
-- Terry Reedy was given SF tracker permissions on 7 Apr 2005 by RDH.
-
-- Nick Coghlan was given SF tracker permissions on 5 Apr 2005 by RDH.
-  For several months, he has been active in reviewing and contributing
-  patches.  The added permissions give him greater flexibility in
-  working with the tracker.
-
-- Eric Price was made a developer on 2 May 2003 by TGP.  This was
-  specifically to work on the new ``decimal`` package, which lived in
-  ``nondist/sandbox/decimal/`` at the time.
-
-- Eric S. Raymond was made a developer on 2 Jul 2000 by TGP, for general
-  library work.  His request is archived here:
-
-      http://mail.python.org/pipermail/python-dev/2000-July/005314.html
-
-
-Permissions Dropped on Request
-------------------------------
-
-- Roy Smith, Matt Fleming and Richard Emslie sent drop requests.
-  4 Aug 2008 GFB
-
-- Per note from Andrew Kuchling, the permissions for Gregory K Johnson
-  and the Summer Of Code project are no longer needed.  4 Aug 2008 GFB
-
-- Per note from Andrew Kuchling, the permissions for Gregory K Johnson
-  and the Summer Of Code project are no longer needed.  AMK will make
-  any future checkins directly.  16 Oct 2005 RDH
-
-- Johannes Gijsbers sent a drop request.  27 July 2005 RDH
-
-- Flovis Bruynooghe sent a drop request.  14 July 2005 RDH
-
-- Paul Prescod sent a drop request.  30 Apr 2005 RDH
-
-- Finn Bock sent a drop request.  13 Apr 2005 RDH
-
-- Eric Price sent a drop request.  10 Apr 2005 RDH
-
-- Irmen de Jong requested dropping CVS access while keeping tracker
-  access.  10 Apr 2005 RDH
-
-- Moshe Zadka and Ken Manheimer sent drop requests.  8 Apr 2005 by RDH
-
-- Steve Holden, Gerhard Haring, and David Cole sent email stating that
-  they no longer use their access.   7 Apr 2005 RDH
-
-
-Permissions Dropped after Loss of Contact
------------------------------------------
-
-- Several unsuccessful efforts were made to contact Charles G Waldman.
-  Removed on 8 Apr 2005 by RDH.
-
-
-Initials of Project Admins
---------------------------
-
-TGP:  Tim Peters
-GFB:  Georg Brandl
-BAC:  Brett Cannon
-NCN:  Neal Norwitz
-DJG:  David Goodger
-MvL:  Martin v. Loewis
-GvR:  Guido van Rossum
-RDH:  Raymond Hettinger
diff --git a/Misc/gdbinit b/Misc/gdbinit
index 2c89a7abf6..9484b51824 100644
--- a/Misc/gdbinit
+++ b/Misc/gdbinit
@@ -12,8 +12,7 @@
 #
 # NOTE: If you have gdb 7 or later, it supports debugging of Python directly
 # with embedded macros that you may find superior to what is in here.
-# See https://fedoraproject.org/wiki/Features/EasierPythonDebugging
-# and http://bugs.python.org/issue8032 for more gdb 7 python information.
+# See Tools/gdb/libpython.py and http://bugs.python.org/issue8032.
 
 # Prints a representation of the object to stderr, along with the
 # number of reference counts it current has and the hex address the
@@ -119,12 +118,18 @@ end
 # interpreter, but the test can be extended by an interested party).  If
 # Py_Main <= $pc <= Py_GetArgcArv is true, $pc is in Py_Main(), so the while
 # tests succeeds as long as it's not true.  In a similar fashion the if
-# statement tests to see if we are in PyEval_EvalFrame().
+# statement tests to see if we are in PyEval_EvalFrameEx().
+
+# Note: The name of the main interpreter function and the function which
+# follow it has changed over time.  This version of pystack works with this
+# version of Python.  If you try using it with older or newer versions of
+# the interpreter you may will have to change the functions you compare with
+# $pc.
 
 # print the entire Python call stack
 define pystack
     while $pc < Py_Main || $pc > Py_GetArgcArgv
-        if $pc > PyEval_EvalFrame && $pc < PyEval_EvalCodeEx
+        if $pc > PyEval_EvalFrameEx && $pc < PyEval_EvalCodeEx
 	    pyframe
         end
         up-silently 1
@@ -135,7 +140,7 @@ end
 # print the entire Python call stack - verbose mode
 define pystackv
     while $pc < Py_Main || $pc > Py_GetArgcArgv
-        if $pc > PyEval_EvalFrame && $pc < PyEval_EvalCodeEx
+        if $pc > PyEval_EvalFrameEx && $pc < PyEval_EvalCodeEx
 	    pyframev
         end
         up-silently 1
diff --git a/Misc/maintainers.rst b/Misc/maintainers.rst
deleted file mode 100644
index 3a91e4baf8..0000000000
--- a/Misc/maintainers.rst
+++ /dev/null
@@ -1,314 +0,0 @@
-Maintainers Index
-=================
-
-.. warning::
-
-   This document is out of date and replaced by another version in the
-   developer's guide at http://docs.python.org/devguide/experts
-
-This document has tables that list Python Modules, Tools, Platforms and
-Interest Areas and names for each item that indicate a maintainer or an
-expert in the field.  This list is intended to be used by issue submitters,
-issue triage people, and other issue participants to find people to add to
-the nosy list or to contact directly by email for help and decisions on
-feature requests and bug fixes.  People on this list may be asked to render
-final judgement on a feature or bug.  If no active maintainer is listed for
-a given module, then questionable changes should go to python-dev, while
-any other issues can and should be decided by any committer.
-
-Unless a name is followed by a '*', you should never assign an issue to
-that person, only make them nosy.  Names followed by a '*' may be assigned
-issues involving the module or topic.
-
-The Platform and Interest Area tables list broader fields in which various
-people have expertise.  These people can also be contacted for help,
-opinions, and decisions when issues involve their areas.
-
-If a listed maintainer does not respond to requests for comment for an
-extended period (three weeks or more), they should be marked as inactive
-in this list by placing the word 'inactive' in parenthesis behind their
-tracker id.  They are of course free to remove that inactive mark at
-any time.
-
-Committers should update these tables as their areas of expertise widen.
-New topics may be added to the Interest Area table at will.
-
-The existence of this list is not meant to indicate that these people
-*must* be contacted for decisions; it is, rather, a resource to be used
-by non-committers to find responsible parties, and by committers who do
-not feel qualified to make a decision in a particular context.
-
-See also `PEP 291`_ and `PEP 360`_ for information about certain modules
-with special rules.
-
-.. _`PEP 291`: http://www.python.org/dev/peps/pep-0291/
-.. _`PEP 360`: http://www.python.org/dev/peps/pep-0360/
-
-
-==================  ===========
-Module              Maintainers
-==================  ===========
-__future__
-__main__            gvanrossum
-_dummy_thread       brett.cannon
-_thread             pitrou
-abc
-aifc                r.david.murray
-argparse            bethard
-array
-ast
-asynchat            josiahcarlson, giampaolo.rodola, stutzbach
-asyncore            josiahcarlson, giampaolo.rodola, stutzbach
-atexit
-audioop
-base64
-bdb
-binascii
-binhex
-bisect              rhettinger
-builtins
-bz2
-calendar            rhettinger
-cgi
-cgitb
-chunk
-cmath               mark.dickinson
-cmd
-code
-codecs              lemburg, doerwalter
-codeop
-collections         rhettinger
-collections._abcoll rhettinger, stutzbach
-colorsys
-compileall
-configparser        lukasz.langa
-contextlib          ncoghlan
-copy                alexandre.vassalotti
-copyreg             alexandre.vassalotti
-cProfile
-crypt               jafo*
-csv                 skip.montanaro
-ctypes              theller
-curses
-datetime            belopolsky
-dbm
-decimal             facundobatista, rhettinger, mark.dickinson
-difflib             tim_one (inactive)
-dis
-distutils           tarek*, eric.araujo*
-doctest             tim_one (inactive)
-dummy_threading     brett.cannon
-email               barry, r.david.murray*
-encodings           lemburg, loewis
-errno
-exceptions
-fcntl
-filecmp
-fileinput
-fnmatch
-formatter
-fpectl
-fractions           mark.dickinson, rhettinger
-ftplib              giampaolo.rodola
-functools           ncoghlan, rhettinger
-gc                  pitrou
-getopt
-getpass
-gettext             loewis
-glob
-grp
-gzip
-hashlib
-heapq               rhettinger, stutzbach
-hmac
-html
-http
-idlelib             kbk
-imaplib
-imghdr
-imp
-importlib           brett.cannon
-inspect
-io                  pitrou, benjamin.peterson, stutzbach
-itertools           rhettinger
-json                bob.ippolito (inactive), rhettinger
-keyword
-lib2to3             benjamin.peterson
-linecache
-locale              loewis, lemburg
-logging             vinay.sajip
-macpath
-mailbox
-mailcap
-marshal
-math                mark.dickinson, rhettinger, stutzbach
-mimetypes
-mmap
-modulefinder        theller, jvr
-msilib              loewis
-msvcrt
-multiprocessing     jnoller
-netrc
-nis
-nntplib             pitrou
-numbers
-operator
-optparse            aronacher
-os                  loewis
-ossaudiodev
-parser
-pdb                 georg.brandl*
-pickle              alexandre.vassalotti, pitrou
-pickletools         alexandre.vassalotti
-pipes
-pkgutil
-platform            lemburg
-plistlib
-poplib
-posix
-pprint              fdrake
-profile             georg.brandl
-pstats              georg.brandl
-pty
-pwd
-py_compile
-pybench             lemburg, pitrou
-pyclbr
-pydoc
-queue               rhettinger
-quopri
-random              rhettinger
-re                  effbot (inactive), pitrou, ezio.melotti
-readline
-reprlib
-resource
-rlcompleter
-runpy               ncoghlan
-sched
-select
-shelve
-shlex
-shutil              tarek
-signal
-site
-smtpd
-smtplib
-sndhdr
-socket
-socketserver
-spwd
-sqlite3             ghaering
-ssl                 janssen, pitrou, giampaolo.rodola
-stat
-string              georg.brandl*
-stringprep
-struct              mark.dickinson
-subprocess          astrand (inactive)
-sunau
-symbol
-symtable            benjamin.peterson
-sys
-sysconfig           tarek
-syslog              jafo*
-tabnanny            tim_one (inactive)
-tarfile             lars.gustaebel
-telnetlib
-tempfile            georg.brandl
-termios
-test
-textwrap            georg.brandl
-threading           pitrou
-time                belopolsky
-timeit              georg.brandl
-tkinter             gpolo
-token               georg.brandl
-tokenize
-trace               belopolsky
-traceback           georg.brandl*
-tty
-turtle              gregorlingl
-types
-unicodedata         loewis, lemburg, ezio.melotti
-unittest            michael.foord, ezio.melotti
-urllib              orsenthil
-uu
-uuid
-warnings            brett.cannon
-wave
-weakref             fdrake, pitrou
-webbrowser          georg.brandl
-winreg              brian.curtin*, stutzbach
-winsound            effbot (inactive)
-wsgiref             pje
-xdrlib
-xml.dom
-xml.dom.minidom
-xml.dom.pulldom
-xml.etree           effbot (inactive)
-xml.parsers.expat
-xml.sax
-xml.sax.handler
-xml.sax.saxutils
-xml.sax.xmlreader
-xmlrpc              loewis
-zipfile             alanmcintyre
-zipimport
-zlib
-==================  ===========
-
-
-==================  ===========
-Tool                Maintainers
-------------------  -----------
-pybench             lemburg
-==================  ===========
-
-
-==================  ===========
-Platform            Maintainers
-------------------  -----------
-AIX
-Cygwin              jlt63, stutzbach
-FreeBSD
-HP-UX
-Linux
-Mac                 ronaldoussoren, ned.deily
-NetBSD1
-OS2/EMX             aimacintyre
-Solaris
-Windows             tim.golden, brian.curtin
-==================  ===========
-
-
-==================  ===========
-Interest Area       Maintainers
-------------------  -----------
-algorithms
-ast/compiler        ncoghlan, benjamin.peterson, brett.cannon, georg.brandl
-autoconf/makefiles
-bsd
-bug tracker         ezio.melotti
-buildbots
-bytecode            pitrou
-data formats        mark.dickinson, georg.brandl
-database            lemburg
-documentation       georg.brandl, ezio.melotti
-GUI
-i18n                lemburg
-import machinery    brett.cannon, ncoghlan
-io                  pitrou, benjamin.peterson, stutzbach
-locale              lemburg, loewis
-mathematics         mark.dickinson, eric.smith, lemburg, stutzbach
-memory management   tim_one, lemburg
-networking          giampaolo.rodola
-packaging           tarek, lemburg
-py3 transition      benjamin.peterson
-release management  tarek, lemburg, benjamin.peterson, barry, loewis,
-                    gvanrossum, anthonybaxter
-str.format          eric.smith
-testing             michael.foord, pitrou, giampaolo.rodola, ezio.melotti
-threads             pitrou
-time and dates      lemburg, belopolsky
-unicode             lemburg, ezio.melotti, haypo
-version control
-==================  ===========
diff --git a/Misc/pymemcompat.h b/Misc/pymemcompat.h
deleted file mode 100644
index 2757e3acdd..0000000000
--- a/Misc/pymemcompat.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* The idea of this file is that you bundle it with your extension,
-   #include it, program to Python 2.3's memory API and have your
-   extension build with any version of Python from 1.5.2 through to
-   2.3 (and hopefully beyond). */
-
-#ifndef Py_PYMEMCOMPAT_H
-#define Py_PYMEMCOMPAT_H
-
-#include "Python.h"
-
-/* There are three "families" of memory API: the "raw memory", "object
-   memory" and "object" families.  (This is ignoring the matter of the
-   cycle collector, about which more is said below).
-
-   Raw Memory:
-
-       PyMem_Malloc, PyMem_Realloc, PyMem_Free
-
-   Object Memory:
-
-       PyObject_Malloc, PyObject_Realloc, PyObject_Free
-
-   Object:
-
-       PyObject_New, PyObject_NewVar, PyObject_Del
-
-   The raw memory and object memory allocators both mimic the
-   malloc/realloc/free interface from ANSI C, but the object memory
-   allocator can (and, since 2.3, does by default) use a different
-   allocation strategy biased towards lots of "small" allocations.
-
-   The object family is used for allocating Python objects, and the
-   initializers take care of some basic initialization (setting the
-   refcount to 1 and filling out the ob_type field) as well as having
-   a somewhat different interface.
-
-   Do not mix the families!  E.g. do not allocate memory with
-   PyMem_Malloc and free it with PyObject_Free.  You may get away with
-   it quite a lot of the time, but there *are* scenarios where this
-   will break.  You Have Been Warned. 
-
-   Also, in many versions of Python there are an insane amount of
-   memory interfaces to choose from.  Use the ones described above. */
-
-#if PY_VERSION_HEX < 0x01060000
-/* raw memory interface already present */
-
-/* there is no object memory interface in 1.5.2 */
-#define PyObject_Malloc		PyMem_Malloc
-#define PyObject_Realloc	PyMem_Realloc
-#define PyObject_Free		PyMem_Free
-
-/* the object interface is there, but the names have changed */
-#define PyObject_New		PyObject_NEW
-#define PyObject_NewVar		PyObject_NEW_VAR
-#define PyObject_Del		PyMem_Free
-#endif
-
-/* If your object is a container you probably want to support the
-   cycle collector, which was new in Python 2.0.
-
-   Unfortunately, the interface to the collector that was present in
-   Python 2.0 and 2.1 proved to be tricky to use, and so changed in
-   2.2 -- in a way that can't easily be papered over with macros.
-
-   This file contains macros that let you program to the 2.2 GC API.
-   Your module will compile against any Python since version 1.5.2,
-   but the type will only participate in the GC in versions 2.2 and
-   up.  Some work is still necessary on your part to only fill out the
-   tp_traverse and tp_clear fields when they exist and set tp_flags
-   appropriately.
-
-   It is possible to support both the 2.0 and 2.2 GC APIs, but it's
-   not pretty and this comment block is too narrow to contain a
-   desciption of what's required... */
-
-#if PY_VERSION_HEX < 0x020200B1
-#define PyObject_GC_New         PyObject_New
-#define PyObject_GC_NewVar      PyObject_NewVar
-#define PyObject_GC_Del         PyObject_Del
-#define PyObject_GC_Track(op)
-#define PyObject_GC_UnTrack(op)
-#endif
-
-#endif /* !Py_PYMEMCOMPAT_H */
diff --git a/Misc/python-config.in b/Misc/python-config.in
index 47ea669bd5..1d4a81d850 100644
--- a/Misc/python-config.in
+++ b/Misc/python-config.in
@@ -1,12 +1,13 @@
 #!@EXENAME@
+# -*- python -*-
 
-import sys
-import os
 import getopt
-from distutils import sysconfig
+import os
+import sys
+import sysconfig
 
 valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags',
-              'ldflags', 'help']
+              'ldflags', 'extension-suffix', 'help', 'abiflags']
 
 def exit_with_usage(code=1):
     print("Usage: {0} [{1}]".format(
@@ -21,33 +22,41 @@ except getopt.error:
 if not opts:
     exit_with_usage()
 
-opt = opts[0][0]
-
 pyver = sysconfig.get_config_var('VERSION')
 getvar = sysconfig.get_config_var
 
-if opt == '--help':
-    exit_with_usage(0)
-
-elif opt == '--prefix':
-    print(sysconfig.PREFIX)
-
-elif opt == '--exec-prefix':
-    print(sysconfig.EXEC_PREFIX)
-
-elif opt in ('--includes', '--cflags'):
-    flags = ['-I' + sysconfig.get_python_inc(),
-             '-I' + sysconfig.get_python_inc(plat_specific=True)]
-    if opt == '--cflags':
-        flags.extend(getvar('CFLAGS').split())
-    print(' '.join(flags))
-
-elif opt in ('--libs', '--ldflags'):
-    libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
-    libs.append('-lpython'+pyver)
-    # add the prefix/lib/pythonX.Y/config dir, but only if there is no
-    # shared library in prefix/lib/.
-    if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
-        libs.insert(0, '-L' + getvar('LIBPL'))
-    print(' '.join(libs))
-
+opt_flags = [flag for (flag, val) in opts]
+
+if '--help' in opt_flags:
+    exit_with_usage(code=0)
+
+for opt in opt_flags:
+    if opt == '--prefix':
+        print(sysconfig.get_config_var('prefix'))
+
+    elif opt == '--exec-prefix':
+        print(sysconfig.get_config_var('exec_prefix'))
+
+    elif opt in ('--includes', '--cflags'):
+        flags = ['-I' + sysconfig.get_path('include'),
+                 '-I' + sysconfig.get_path('platinclude')]
+        if opt == '--cflags':
+            flags.extend(getvar('CFLAGS').split())
+        print(' '.join(flags))
+
+    elif opt in ('--libs', '--ldflags'):
+        libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
+        libs.append('-lpython' + pyver + sys.abiflags)
+        # add the prefix/lib/pythonX.Y/config dir, but only if there is no
+        # shared library in prefix/lib/.
+        if opt == '--ldflags':
+            if not getvar('Py_ENABLE_SHARED'):
+                libs.insert(0, '-L' + getvar('LIBPL'))
+            libs.extend(getvar('LINKFORSHARED').split())
+        print(' '.join(libs))
+
+    elif opt == '--extension-suffix':
+        print(sysconfig.get_config_var('SO'))
+
+    elif opt == '--abiflags':
+        print(sys.abiflags)
diff --git a/Misc/python-wing.wpr b/Misc/python-wing3.wpr
index b1d905d60d..abe789412d 100644
--- a/Misc/python-wing.wpr
+++ b/Misc/python-wing3.wpr
@@ -5,7 +5,7 @@
 ##################################################################
 [project attributes]
 proj.directory-list = [{'dirloc': loc('..'),
-                        'excludes': (),
+                        'excludes': [u'Lib/__pycache__'],
                         'filter': '*',
                         'include_hidden': False,
                         'recursive': True,
diff --git a/Misc/python-wing4.wpr b/Misc/python-wing4.wpr
new file mode 100644
index 0000000000..7adfdbdacf
--- /dev/null
+++ b/Misc/python-wing4.wpr
@@ -0,0 +1,18 @@
+#!wing
+#!version=4.0
+##################################################################
+# Wing IDE project file                                          #
+##################################################################
+[project attributes]
+proj.directory-list = [{'dirloc': loc('..'),
+                        'excludes': [u'.hg',
+                                     u'Lib/unittest/__pycache__',
+                                     u'Lib/unittest/test/__pycache__',
+                                     u'Lib/__pycache__',
+                                     u'build',
+                                     u'Doc/build'],
+                        'filter': '*',
+                        'include_hidden': False,
+                        'recursive': True,
+                        'watch_for_changes': True}]
+proj.file-type = 'shared'
diff --git a/Misc/python.man b/Misc/python.man
index 87f1c93c70..2d15d5d336 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -26,6 +26,9 @@ python \- an interpreted, interactive, object-oriented programming language
 .B \-m 
 .I module-name
 ]
+[
+.B \-q
+]
 .br
        [
 .B \-O
@@ -145,6 +148,10 @@ to \fI.pyo\fP.  Given twice, causes docstrings to be discarded.
 .B \-O0
 Discard docstrings in addition to the \fB-O\fP optimizations.
 .TP
+.B \-q
+Do not print the version and copyright messages. These messages are 
+also suppressed in non-interactive mode.
+.TP
 .BI "\-Q " argument
 Division control; see PEP 238.  The argument must be one of "old" (the
 default, int/int and long/long return an int or long), "new" (new
@@ -403,6 +410,9 @@ the \fB\-u\fP option.
 If this is set to a non-empty string it is equivalent to specifying
 the \fB\-v\fP option. If set to an integer, it is equivalent to
 specifying \fB\-v\fP multiple times. 
+.IP PYTHONWARNINGS
+If this is set to a comma-separated string it is equivalent to
+specifying the \fB\-W\fP option for each separate value.
 .SH AUTHOR
 The Python Software Foundation: http://www.python.org/psf
 .SH INTERNET RESOURCES
diff --git a/Misc/python.pc.in b/Misc/python.pc.in
index 08481a9580..ae698674bb 100644
--- a/Misc/python.pc.in
+++ b/Misc/python.pc.in
@@ -1,3 +1,4 @@
+# See: man pkg-config
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
@@ -8,6 +9,5 @@ Description: Python library
 Requires: 
 Version: @VERSION@
 Libs.private: @LIBS@
-Libs: -L${libdir} -lpython@VERSION@
-Cflags: -I${includedir}/python@VERSION@ 
-
+Libs: -L${libdir} -lpython@VERSION@@ABIFLAGS@
+Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@
diff --git a/Misc/setuid-prog.c b/Misc/setuid-prog.c
deleted file mode 100644
index 3785d99d7f..0000000000
--- a/Misc/setuid-prog.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-   Template for a setuid program that calls a script.
-
-   The script should be in an unwritable directory and should itself
-   be unwritable.  In fact all parent directories up to the root
-   should be unwritable.  The script must not be setuid, that's what
-   this program is for.
-
-   This is a template program.  You need to fill in the name of the
-   script that must be executed.  This is done by changing the
-   definition of FULL_PATH below.
-
-   There are also some rules that should be adhered to when writing
-   the script itself.
-
-   The first and most important rule is to never, ever trust that the
-   user of the program will behave properly.  Program defensively.
-   Check your arguments for reasonableness.  If the user is allowed to
-   create files, check the names of the files.  If the program depends
-   on argv[0] for the action it should perform, check it.
-
-   Assuming the script is a Bourne shell script, the first line of the
-   script should be
-    #!/bin/sh -
-   The - is important, don't omit it.  If you're using esh, the first
-   line should be
-    #!/usr/local/bin/esh -f
-   and for ksh, the first line should be
-    #!/usr/local/bin/ksh -p
-   The script should then set the variable IFS to the string
-   consisting of <space>, <tab>, and <newline>.  After this (*not*
-   before!), the PATH variable should be set to a reasonable value and
-   exported.  Do not expect the PATH to have a reasonable value, so do
-   not trust the old value of PATH.  You should then set the umask of
-   the program by calling
-    umask 077 # or 022 if you want the files to be readable
-   If you plan to change directories, you should either unset CDPATH
-   or set it to a good value.  Setting CDPATH to just ``.'' (dot) is a
-   good idea.
-   If, for some reason, you want to use csh, the first line should be
-    #!/bin/csh -fb
-   You should then set the path variable to something reasonable,
-   without trusting the inherited path.  Here too, you should set the
-   umask using the command
-    umask 077 # or 022 if you want the files to be readable
-*/
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-
-/* CONFIGURATION SECTION */
-
-#ifndef FULL_PATH       /* so that this can be specified from the Makefile */
-/* Uncomment the following line:
-#define FULL_PATH       "/full/path/of/script"
-* Then comment out the #error line. */
-#error "You must define FULL_PATH somewhere"
-#endif
-#ifndef UMASK
-#define UMASK           077
-#endif
-
-/* END OF CONFIGURATION SECTION */
-
-#if defined(__STDC__) && defined(__sgi)
-#define environ _environ
-#endif
-
-/* don't change def_IFS */
-char def_IFS[] = "IFS= \t\n";
-/* you may want to change def_PATH, but you should really change it in */
-/* your script */
-#ifdef __sgi
-char def_PATH[] = "PATH=/usr/bsd:/usr/bin:/bin:/usr/local/bin:/usr/sbin";
-#else
-char def_PATH[] = "PATH=/usr/ucb:/usr/bin:/bin:/usr/local/bin";
-#endif
-/* don't change def_CDPATH */
-char def_CDPATH[] = "CDPATH=.";
-/* don't change def_ENV */
-char def_ENV[] = "ENV=:";
-
-/*
-   This function changes all environment variables that start with LD_
-   into variables that start with XD_.  This is important since we
-   don't want the script that is executed to use any funny shared
-   libraries.
-
-   The other changes to the environment are, strictly speaking, not
-   needed here.  They can safely be done in the script.  They are done
-   here because we don't trust the script writer (just like the script
-   writer shouldn't trust the user of the script).
-   If IFS is set in the environment, set it to space,tab,newline.
-   If CDPATH is set in the environment, set it to ``.''.
-   Set PATH to a reasonable default.
-*/
-void
-clean_environ(void)
-{
-    char **p;
-    extern char **environ;
-
-    for (p = environ; *p; p++) {
-        if (strncmp(*p, "LD_", 3) == 0)
-            **p = 'X';
-        else if (strncmp(*p, "_RLD", 4) == 0)
-            **p = 'X';
-        else if (strncmp(*p, "PYTHON", 6) == 0)
-            **p = 'X';
-        else if (strncmp(*p, "IFS=", 4) == 0)
-            *p = def_IFS;
-        else if (strncmp(*p, "CDPATH=", 7) == 0)
-            *p = def_CDPATH;
-        else if (strncmp(*p, "ENV=", 4) == 0)
-            *p = def_ENV;
-    }
-    putenv(def_PATH);
-}
-
-int
-main(int argc, char **argv)
-{
-    struct stat statb;
-    gid_t egid = getegid();
-    uid_t euid = geteuid();
-
-    /*
-       Sanity check #1.
-       This check should be made compile-time, but that's not possible.
-       If you're sure that you specified a full path name for FULL_PATH,
-       you can omit this check.
-    */
-    if (FULL_PATH[0] != '/') {
-        fprintf(stderr, "%s: %s is not a full path name\n", argv[0],
-            FULL_PATH);
-        fprintf(stderr, "You can only use this wrapper if you\n");
-        fprintf(stderr, "compile it with an absolute path.\n");
-        exit(1);
-    }
-
-    /*
-       Sanity check #2.
-       Check that the owner of the script is equal to either the
-       effective uid or the super user.
-    */
-    if (stat(FULL_PATH, &statb) < 0) {
-        perror("stat");
-        exit(1);
-    }
-    if (statb.st_uid != 0 && statb.st_uid != euid) {
-        fprintf(stderr, "%s: %s has the wrong owner\n", argv[0],
-            FULL_PATH);
-        fprintf(stderr, "The script should be owned by root,\n");
-        fprintf(stderr, "and shouldn't be writable by anyone.\n");
-        exit(1);
-    }
-
-    if (setregid(egid, egid) < 0)
-        perror("setregid");
-    if (setreuid(euid, euid) < 0)
-        perror("setreuid");
-
-    clean_environ();
-
-    umask(UMASK);
-
-    while (**argv == '-')       /* don't let argv[0] start with '-' */
-        (*argv)++;
-    execv(FULL_PATH, argv);
-    fprintf(stderr, "%s: could not execute the script\n", argv[0]);
-    exit(1);
-}
author	Ronald Oussoren <ronaldoussoren@mac.com>	2011-03-16 09:43:06 -0400
committer	Ronald Oussoren <ronaldoussoren@mac.com>	2011-03-16 09:43:06 -0400
commit	9d594ca842ed3426393a24236e8452fc0532f527 (patch)
tree	be6b249858fb277f0cc512d49b7f54ee439a3dae /Misc
parent	c04ce0236c49d9f712ab8e4f11758d0b7d35154d (diff)
parent	5c23d8fb736f0c55edec98df2030117bea152326 (diff)
download	cpython-9d594ca842ed3426393a24236e8452fc0532f527.tar.gz