mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-03 05:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 85274 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85274 | georg.brandl | 2010-10-06 12:26:05 +0200 (Mi, 06 Okt 2010) | 1 line

  Fix errors found by "make suspicious".
........
This commit is contained in:
Georg Brandl 2010-10-06 10:41:31 +00:00
parent 0d8f375a2c
commit 35e7a8fa53
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/faq/library.rst
View file

@ -458,7 +458,7 @@ To rename a file, use ``os.rename(old_path, new_path)``.
To truncate a file, open it using ``f = open(filename, "r+")``, and use To truncate a file, open it using ``f = open(filename, "r+")``, and use
``f.truncate(offset)``; offset defaults to the current seek position. There's ``f.truncate(offset)``; offset defaults to the current seek position. There's
also ```os.ftruncate(fd, offset)`` for files opened with :func:`os.open`, where also ``os.ftruncate(fd, offset)`` for files opened with :func:`os.open`, where
``fd`` is the file descriptor (a small integer). ``fd`` is the file descriptor (a small integer).
The :mod:`shutil` module also contains a number of functions to work on files The :mod:`shutil` module also contains a number of functions to work on files

2
Doc/faq/windows.rst
View file

@ -594,7 +594,7 @@ Warning about CTL3D32 version from installer
The Python installer issues a warning like this:: The Python installer issues a warning like this::
This version uses ``CTL3D32.DLL`` which is not the correct version. This version uses CTL3D32.DLL which is not the correct version.
This version is used for windows NT applications only. This version is used for windows NT applications only.
Tim Peters: Tim Peters:

2
Doc/library/datetime.rst
View file

@ -944,7 +944,7 @@ Instance methods:
d.toordinal() - date(d.year, 1, 1).toordinal() + 1`` is the day number within d.toordinal() - date(d.year, 1, 1).toordinal() + 1`` is the day number within
the current year starting with ``1`` for January 1st. The :attr:`tm_isdst` flag the current year starting with ``1`` for January 1st. The :attr:`tm_isdst` flag
of the result is set according to the :meth:`dst` method: :attr:`tzinfo` is of the result is set according to the :meth:`dst` method: :attr:`tzinfo` is
``None`` or :meth:`dst`` returns ``None``, :attr:`tm_isdst` is set to ``-1``; ``None`` or :meth:`dst` returns ``None``, :attr:`tm_isdst` is set to ``-1``;
else if :meth:`dst` returns a non-zero value, :attr:`tm_isdst` is set to ``1``; else if :meth:`dst` returns a non-zero value, :attr:`tm_isdst` is set to ``1``;
else :attr:`tm_isdst` is set to ``0``. else :attr:`tm_isdst` is set to ``0``.

2
Doc/library/optparse.rst
View file

@ -1216,7 +1216,7 @@ although with a more useful error message.
:func:`float` and :func:`complex`, with similar error-handling. :func:`float` and :func:`complex`, with similar error-handling.
``"choice"`` options are a subtype of ``"string"`` options. The ``"choice"`` options are a subtype of ``"string"`` options. The
:attr:`~Option.choices`` option attribute (a sequence of strings) defines the :attr:`~Option.choices` option attribute (a sequence of strings) defines the
set of allowed option arguments. :func:`optparse.check_choice` compares set of allowed option arguments. :func:`optparse.check_choice` compares
user-supplied option arguments against this master list and raises user-supplied option arguments against this master list and raises
:exc:`OptionValueError` if an invalid string is given. :exc:`OptionValueError` if an invalid string is given.

2
Doc/library/wsgiref.rst
View file

@ -712,7 +712,7 @@ This is a working "Hello World" WSGI application::
# use a function (note that you're not limited to a function, you can # use a function (note that you're not limited to a function, you can
# use a class for example). The first argument passed to the function # use a class for example). The first argument passed to the function
# is a dictionary containing CGI-style envrironment variables and the # is a dictionary containing CGI-style envrironment variables and the
# second variable is the callable object (see :pep:`333`) # second variable is the callable object (see PEP 333).
def hello_world_app(environ, start_response): def hello_world_app(environ, start_response):
status = '200 OK' # HTTP Status status = '200 OK' # HTTP Status
headers = [('Content-type', 'text/plain')] # HTTP Headers headers = [('Content-type', 'text/plain')] # HTTP Headers