traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.4 (#12855)

This commit is contained in:
Benjamin Peterson 2015-03-31 21:21:09 -04:00
parent 70a46f635f 8218bd4caf
commit f8521d55ad
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Doc/library/stdtypes.rst
View File

@ -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::