[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

Mon Mar 12 17:56:06 CET 2012

http://hg.python.org/cpython/rev/fd60aab46733
changeset: 75538:fd60aab46733
parent: 75525:f452d7d5470d
parent: 75537:13f251824b6b
user: Benjamin Peterson <benjamin at python.org>
date: Mon Mar 12 09:28:36 2012 -0700
summary:
 merge 3.2
files:
 Doc/glossary.rst | 2 +-
 Lib/test/test_ast.py | 3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -147,7 +147,7 @@
 
 dictionary
 An associative array, where arbitrary keys are mapped to values. The keys
- can be any object with :meth:`__hash__` function and :meth:`__eq__`
+ can be any object with :meth:`__hash__` method and :meth:`__eq__`
 methods. Called a hash in Perl.
 
 docstring
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -201,9 +201,6 @@
 x.vararg
 
 with self.assertRaises(AttributeError):
- x.foobar = 21
-
- with self.assertRaises(AttributeError):
 ast.AST(lineno=2)
 
 with self.assertRaises(TypeError):
-- 
Repository URL: http://hg.python.org/cpython
