merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-06 16:48:38 +02:00
commit 033ec051f8

View file

@ -355,8 +355,8 @@ Glossary
All of Python's immutable built-in objects are hashable, while no mutable
containers (such as lists or dictionaries) are. Objects which are
instances of user-defined classes are hashable by default; they all
compare unequal (except with themselves), and their hash value is their
:func:`id`.
compare unequal (except with themselves), and their hash value is derived
from their :func:`id`.
IDLE
An Integrated Development Environment for Python. IDLE is a basic editor