diff options
| author | Sandro Tosi <sandro.tosi@gmail.com> | 2012-02-28 21:29:08 (GMT) |
|---|---|---|
| committer | Sandro Tosi <sandro.tosi@gmail.com> | 2012-02-28 21:29:08 (GMT) |
| commit | 0109e3cd24c54050b5c894e53823e00df65c12b0 (patch) | |
| tree | a1077927f8488dae0153a8c292548c1e79ba9a09 | |
| parent | 19b1d50732aace91208bb3a7ab1fcbace9883bae (diff) | |
| parent | 83c48822c5b99794492d7b6356b45f889bc8c9b1 (diff) | |
| download | cpython-0109e3cd24c54050b5c894e53823e00df65c12b0.zip cpython-0109e3cd24c54050b5c894e53823e00df65c12b0.tar.gz cpython-0109e3cd24c54050b5c894e53823e00df65c12b0.tar.bz2 | |
merge with 3.2
| -rw-r--r-- | Doc/library/operator.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/operator.rst b/Doc/library/operator.rst index b03d9df..9ba7f41 100644 --- a/Doc/library/operator.rst +++ b/Doc/library/operator.rst @@ -340,7 +340,7 @@ Python syntax and the functions in the :mod:`operator` module. +-----------------------+-------------------------+---------------------------------------+ | Containment Test | ``obj in seq`` | ``contains(seq, obj)`` | +-----------------------+-------------------------+---------------------------------------+ -| Division | ``a / b`` | ``div(a, b)`` | +| Division | ``a / b`` | ``truediv(a, b)`` | +-----------------------+-------------------------+---------------------------------------+ | Division | ``a // b`` | ``floordiv(a, b)`` | +-----------------------+-------------------------+---------------------------------------+ |