[Python-checkins] cpython (merge 3.2 -> default): Merge branch '3.2' into default

[daniel.stutzbach]

http://hg.python.org/cpython/rev/29672ac2d765
changeset:   68082:29672ac2d765
parent:      68080:86700f7b0f59
parent:      68081:443d96f45aa4
user:        Daniel Stutzbach <stutzbach at google.com>
date:        Fri Mar 04 15:37:01 2011 -0800
summary:
  Merge branch '3.2' into default

Conflicts:
	README

files:
  README

diff --git a/README b/README
--- a/README
+++ b/README
@@ -4,12 +4,10 @@
 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 Python Software Foundation.  All rights reserved.
 
-Python 3.x is a new version of the language that all of the cool kids are
-using. Its incompatible with the 2.x line of releases, but porting isn't
-that hard, although it's harder than ripping it on internet message boards.
-The language is mostly the same, but many details, especially how built-in
-objects like dictionaries and strings work, have changed considerably for the
-better, and a lot of deprecated features have finally been removed. 
+Python 3.x is a new version of the language, which is incompatible
+with the 2.x line of releases.  The language is mostly the same, but
+many features have been deprecated and built-in objects like
+dictionaries and strings work have finally been removed.
 
 
 Build Instructions

-- 
Repository URL: http://hg.python.org/cpython