diff options
| author | Georg Brandl <georg@python.org> | 2014-10-31 09:39:29 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-31 09:39:29 (GMT) |
| commit | e21a531ef10e120a94434b3d4806a8106dd6f271 (patch) | |
| tree | 0b1d0245388effa5cbf130744b50af6ab6a1eb5f /Doc/reference/expressions.rst | |
| parent | fe98180bced16be7d62b762cc85d400f929d0885 (diff) | |
| parent | a4c8c47961305487ef6c40a6d882bb956f2c5a0b (diff) | |
| download | cpython-e21a531ef10e120a94434b3d4806a8106dd6f271.zip cpython-e21a531ef10e120a94434b3d4806a8106dd6f271.tar.gz cpython-e21a531ef10e120a94434b3d4806a8106dd6f271.tar.bz2 | |
merge with 3.4
Diffstat (limited to 'Doc/reference/expressions.rst')
| -rw-r--r-- | Doc/reference/expressions.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst index 7a93a39..1210c70 100644 --- a/Doc/reference/expressions.rst +++ b/Doc/reference/expressions.rst @@ -619,8 +619,8 @@ slice list contains no proper slice). single: stop (slice object attribute) single: step (slice object attribute) -The semantics for a slicing are as follows. The primary must evaluate to a -mapping object, and it is indexed (using the same :meth:`__getitem__` method as +The semantics for a slicing are as follows. The primary is indexed (using the +same :meth:`__getitem__` method as normal subscription) with a key that is constructed from the slice list, as follows. If the slice list contains at least one comma, the key is a tuple containing the conversion of the slice items; otherwise, the conversion of the |