diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-03-12 16:28:36 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-03-12 16:28:36 (GMT) |
| commit | 09b4bd03f6fcb0c30a1e7bcc07e3647b6da6d410 (patch) | |
| tree | 6bbaa9a855d37878a0a83aebc12f6969367683ed | |
| parent | b69ef16fe63e6de91c5d659bd83d9eff67b38d98 (diff) | |
| parent | 800b3aa57f073403ed2b64c49058e9b88ba582d3 (diff) | |
| download | cpython-09b4bd03f6fcb0c30a1e7bcc07e3647b6da6d410.zip cpython-09b4bd03f6fcb0c30a1e7bcc07e3647b6da6d410.tar.gz cpython-09b4bd03f6fcb0c30a1e7bcc07e3647b6da6d410.tar.bz2 | |
merge 3.2
| -rw-r--r-- | Doc/glossary.rst | 2 | ||||
| -rw-r--r-- | Lib/test/test_ast.py | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst index f5ca0d9..3ac1031 100644 --- a/Doc/glossary.rst +++ b/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 diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py index b809d24..e11246c 100644 --- a/Lib/test/test_ast.py +++ b/Lib/test/test_ast.py @@ -201,9 +201,6 @@ class AST_Tests(unittest.TestCase): x.vararg with self.assertRaises(AttributeError): - x.foobar = 21 - - with self.assertRaises(AttributeError): ast.AST(lineno=2) with self.assertRaises(TypeError): |