merge 3.2

Doc/glossary.rst

@@ -147,7 +147,7 @@ Glossary
 
    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

Lib/test/test_ast.py

@@ -200,9 +200,6 @@ class AST_Tests(unittest.TestCase):
         with self.assertRaises(AttributeError):
             x.vararg
 
-        with self.assertRaises(AttributeError):
-            x.foobar = 21
-
         with self.assertRaises(AttributeError):
             ast.AST(lineno=2)