summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-04-01 01:20:36 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-04-01 01:20:36 (GMT)
commit8218bd4caf683ee98c450a093bf171dbca6c4849 (patch)
tree3d5ada54fe1168d7756424d906d9fd7b46de5578
parentb9100e5d9db64c727f2de579f143853eee4b0ba4 (diff)
downloadcpython-8218bd4caf683ee98c450a093bf171dbca6c4849.zip
cpython-8218bd4caf683ee98c450a093bf171dbca6c4849.tar.gz
cpython-8218bd4caf683ee98c450a093bf171dbca6c4849.tar.bz2
document what exactly str.splitlines() splits on (closes #12855)
Patch by Martin Panter.
-rw-r--r--Doc/library/stdtypes.rst40
1 files changed, 36 insertions, 4 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index d3fc093..0aa9c12 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1855,10 +1855,42 @@ expression support in the :mod:`re` module).
.. method:: str.splitlines([keepends])
- Return a list of the lines in the string, breaking at line boundaries.
- This method uses the :term:`universal newlines` approach to splitting lines.
- Line breaks are not included in the resulting list unless *keepends* is
- given and true.
+ Return a list of the lines in the string, breaking at line boundaries. Line
+ breaks are not included in the resulting list unless *keepends* is given and
+ true.
+
+ This method splits on the following line boundaries. In particular, the
+ boundaries are a superset of :term:`universal newlines`.
+
+ +-----------------------+-----------------------------+
+ | Representation | Description |
+ +=======================+=============================+
+ | ``\n`` | Line Feed |
+ +-----------------------+-----------------------------+
+ | ``\r`` | Carriage Return |
+ +-----------------------+-----------------------------+
+ | ``\r\n`` | Carriage Return + Line Feed |
+ +-----------------------+-----------------------------+
+ | ``\v`` or ``\x0b`` | Line Tabulation |
+ +-----------------------+-----------------------------+
+ | ``\f`` or ``\x0c`` | Form Feed |
+ +-----------------------+-----------------------------+
+ | ``\x1c`` | File Separator |
+ +-----------------------+-----------------------------+
+ | ``\x1d`` | Group Separator |
+ +-----------------------+-----------------------------+
+ | ``\x1e`` | Record Separator |
+ +-----------------------+-----------------------------+
+ | ``\x85`` | Next Line (C1 Control Code) |
+ +-----------------------+-----------------------------+
+ | ``\u2028`` | Line Separator |
+ +-----------------------+-----------------------------+
+ | ``\u2029`` | Paragraph Separator |
+ +-----------------------+-----------------------------+
+
+ .. versionchanged:: 3.2
+
+ ``\v`` and ``\f`` added to list of line boundaries.
For example::