summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2010-08-14 18:03:19 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2010-08-14 18:03:19 (GMT)
commitac521078d7e7a3bd90678d252e8ff91970ec9f5c (patch)
treeb44740a2efff249c42d28e731b7c81d0afa295ca /Doc/library
parent03c9e1dbc2066a1ef9da66b7fad52c8e8c9d742a (diff)
downloadcpython-ac521078d7e7a3bd90678d252e8ff91970ec9f5c.zip
cpython-ac521078d7e7a3bd90678d252e8ff91970ec9f5c.tar.gz
cpython-ac521078d7e7a3bd90678d252e8ff91970ec9f5c.tar.bz2
Remove bad merge (from svnmerge r82301)
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/stdtypes.rst4
1 files changed, 0 insertions, 4 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 76921cd..1b2f591 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1331,10 +1331,6 @@ functions based on regular expressions.
You can use :meth:`str.maketrans` to create a translation map from
character-to-character mappings in different formats.
- You can use the :func:`~string.maketrans` helper function in the :mod:`string`
- module to create a translation table. For string objects, set the *table*
- argument to ``None`` for translations that only delete characters:
-
.. note::
An even more flexible approach is to create a custom character mapping