summaryrefslogtreecommitdiffstats
path: root/Doc/library/os.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-07-26 15:02:41 (GMT)
committerGeorg Brandl <georg@python.org>2009-07-26 15:02:41 (GMT)
commit502d9a5c2cf7c0837911890e7dcccd7aada10adf (patch)
tree5e712865fce6c8490a87873b2b4694bc965d2233 /Doc/library/os.rst
parent22b3431426349a424e3486c279db8b84cf671da0 (diff)
downloadcpython-502d9a5c2cf7c0837911890e7dcccd7aada10adf.zip
cpython-502d9a5c2cf7c0837911890e7dcccd7aada10adf.tar.gz
cpython-502d9a5c2cf7c0837911890e7dcccd7aada10adf.tar.bz2
Merged revisions 74207 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74207 | georg.brandl | 2009-07-26 16:19:57 +0200 (So, 26 Jul 2009) | 1 line #6577: fix (hopefully) all links to builtin instead of module/class-specific objects. ........
Diffstat (limited to 'Doc/library/os.rst')
-rw-r--r--Doc/library/os.rst16
1 files changed, 8 insertions, 8 deletions
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 218437e..db96a56 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -516,10 +516,10 @@ by file descriptors.
.. note::
- This function is intended for low-level I/O. For normal usage, use the built-in
- function :func:`open`, which returns a "file object" with :meth:`~file.read` and
- :meth:`~file.write` methods (and many more). To wrap a file descriptor in a "file
- object", use :func:`fdopen`.
+ This function is intended for low-level I/O. For normal usage, use the
+ built-in function :func:`open`, which returns a "file object" with
+ :meth:`~file.read` and :meth:`~file.write` methods (and many more). To
+ wrap a file descriptor in a "file object", use :func:`fdopen`.
.. function:: openpty()
@@ -662,10 +662,10 @@ Files and Directories
.. note::
- Using :func:`access` to check if a user is authorized to e.g. open a file before
- actually doing so using :func:`open` creates a security hole, because the user
- might exploit the short time interval between checking and opening the file to
- manipulate it.
+ Using :func:`access` to check if a user is authorized to e.g. open a file
+ before actually doing so using :func:`open` creates a security hole,
+ because the user might exploit the short time interval between checking
+ and opening the file to manipulate it.
.. note::