summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-08-15 15:05:36 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-08-15 15:05:36 (GMT)
commitee0a945ae4077d9e4ffdb77e247ed13265316897 (patch)
tree867c956f41f97c2dec722ed838d41934d7d6d460 /Doc/library
parent1b00f25bf99d9b7a5f307984f6467258de636d23 (diff)
downloadcpython-ee0a945ae4077d9e4ffdb77e247ed13265316897.zip
cpython-ee0a945ae4077d9e4ffdb77e247ed13265316897.tar.gz
cpython-ee0a945ae4077d9e4ffdb77e247ed13265316897.tar.bz2
#15543: reflow paragraphs.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/functions.rst5
-rw-r--r--Doc/library/importlib.rst7
-rw-r--r--Doc/library/io.rst14
-rw-r--r--Doc/library/zipfile.rst14
4 files changed, 19 insertions, 21 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 6b80bd9..da07762 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -878,9 +878,8 @@ are always available. They are listed here in alphabetical order.
single: universal newlines; open() built-in function
*newline* controls how :term:`universal newlines` mode works (it only
- applies to text mode).
- It can be ``None``, ``''``, ``'\n'``, ``'\r'``, and ``'\r\n'``. It
- works as follows:
+ applies to text mode). It can be ``None``, ``''``, ``'\n'``, ``'\r'``, and
+ ``'\r\n'``. It works as follows:
* When reading input from the stream, if *newline* is ``None``, universal
newlines mode is enabled. Lines in the input can end in ``'\n'``,
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index 158e7b4..1649063 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -196,10 +196,9 @@ are also provided to help in implementing the core ABCs.
An abstract method to return the source of a module. It is returned as
a text string using :term:`universal newlines`, translating all
- recognized line separators into ``'\n'`` characters.
- Returns ``None`` if no
- source is available (e.g. a built-in module). Raises :exc:`ImportError`
- if the loader cannot find the module specified.
+ recognized line separators into ``'\n'`` characters. Returns ``None``
+ if no source is available (e.g. a built-in module). Raises
+ :exc:`ImportError` if the loader cannot find the module specified.
.. method:: is_package(fullname)
diff --git a/Doc/library/io.rst b/Doc/library/io.rst
index 8e6e601..b71bfd4 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -764,13 +764,13 @@ Text I/O
``''``, ``'\n'``, ``'\r'``, and ``'\r\n'``. It works as follows:
* When reading input from the stream, if *newline* is ``None``,
- :term:`universal newlines` mode is enabled. Lines in the input can end
- in ``'\n'``,
- ``'\r'``, or ``'\r\n'``, and these are translated into ``'\n'`` before
- being returned to the caller. If it is ``''``, universal newlines mode is
- enabled, but line endings are returned to the caller untranslated. If it
- has any of the other legal values, input lines are only terminated by the
- given string, and the line ending is returned to the caller untranslated.
+ :term:`universal newlines` mode is enabled. Lines in the input can end in
+ ``'\n'``, ``'\r'``, or ``'\r\n'``, and these are translated into ``'\n'``
+ before being returned to the caller. If it is ``''``, universal newlines
+ mode is enabled, but line endings are returned to the caller untranslated.
+ If it has any of the other legal values, input lines are only terminated
+ by the given string, and the line ending is returned to the caller
+ untranslated.
* When writing output to the stream, if *newline* is ``None``, any ``'\n'``
characters written are translated to the system default line separator,
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index 4035a14..48edf1f 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -174,13 +174,13 @@ ZipFile Objects
.. method:: ZipFile.open(name, mode='r', pwd=None)
- Extract a member from the archive as a file-like object (ZipExtFile). *name* is
- the name of the file in the archive, or a :class:`ZipInfo` object. The *mode*
- parameter, if included, must be one of the following: ``'r'`` (the default),
- ``'U'``, or ``'rU'``. Choosing ``'U'`` or ``'rU'`` will enable
- :term:`universal newlines` support in the read-only object.
- *pwd* is the password used for encrypted files.
- Calling :meth:`open` on a closed ZipFile will raise a :exc:`RuntimeError`.
+ Extract a member from the archive as a file-like object (ZipExtFile). *name*
+ is the name of the file in the archive, or a :class:`ZipInfo` object. The
+ *mode* parameter, if included, must be one of the following: ``'r'`` (the
+ default), ``'U'``, or ``'rU'``. Choosing ``'U'`` or ``'rU'`` will enable
+ :term:`universal newlines` support in the read-only object. *pwd* is the
+ password used for encrypted files. Calling :meth:`open` on a closed
+ ZipFile will raise a :exc:`RuntimeError`.
.. note::