merge 3.2

This commit is contained in:
Benjamin Peterson 2012-03-12 09:28:36 -07:00
commit 09b4bd03f6
2 changed files with 1 additions and 4 deletions

View File

@ -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

View File

@ -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)