From 35e7a8fa53ccb1f4381b0489b4766c31ad982945 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Wed, 6 Oct 2010 10:41:31 +0000 Subject: [PATCH] Merged revisions 85274 via svnmerge from 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". ........ --- Doc/faq/library.rst | 2 +- Doc/faq/windows.rst | 2 +- Doc/library/argparse.rst | 14 +++++++------- Doc/library/datetime.rst | 2 +- Doc/library/optparse.rst | 2 +- Doc/library/wsgiref.rst | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Doc/faq/library.rst b/Doc/faq/library.rst index e741c583fad..c122d7205a9 100644 --- a/Doc/faq/library.rst +++ b/Doc/faq/library.rst @@ -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 ``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). The :mod:`shutil` module also contains a number of functions to work on files diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst index 1336400780e..a1dec3a7fe7 100644 --- a/Doc/faq/windows.rst +++ b/Doc/faq/windows.rst @@ -594,7 +594,7 @@ Warning about CTL3D32 version from installer 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. Tim Peters: diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst index 45eddca644f..6bd011bea3f 100644 --- a/Doc/library/argparse.rst +++ b/Doc/library/argparse.rst @@ -737,14 +737,14 @@ values are: * N (an integer). N args from the command-line will be gathered together into a list. For example:: - >>> parser = argparse.ArgumentParser() - >>> parser.add_argument('--foo', nargs=2) - >>> parser.add_argument('bar', nargs=1) - >>> parser.parse_args('c --foo a b'.split()) - Namespace(bar=['c'], foo=['a', 'b']) + >>> parser = argparse.ArgumentParser() + >>> parser.add_argument('--foo', nargs=2) + >>> parser.add_argument('bar', nargs=1) + >>> parser.parse_args('c --foo a b'.split()) + Namespace(bar=['c'], foo=['a', 'b']) - Note that ``nargs=1`` produces a list of one item. This is different from - the default, in which the item is produced by itself. + Note that ``nargs=1`` produces a list of one item. This is different from + the default, in which the item is produced by itself. * ``'?'``. One arg will be consumed from the command-line if possible, and produced as a single item. If no command-line arg is present, the value from diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst index 21a2b640f0f..24229bba79b 100644 --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -944,7 +944,7 @@ Instance methods: 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 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 :attr:`tm_isdst` is set to ``0``. diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst index 13649bccb23..2824a26264b 100644 --- a/Doc/library/optparse.rst +++ b/Doc/library/optparse.rst @@ -1216,7 +1216,7 @@ although with a more useful error message. :func:`float` and :func:`complex`, with similar error-handling. ``"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 user-supplied option arguments against this master list and raises :exc:`OptionValueError` if an invalid string is given. diff --git a/Doc/library/wsgiref.rst b/Doc/library/wsgiref.rst index 517fc3849bb..31634972e45 100644 --- a/Doc/library/wsgiref.rst +++ b/Doc/library/wsgiref.rst @@ -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 class for example). The first argument passed to the function # 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): status = '200 OK' # HTTP Status headers = [('Content-type', 'text/plain')] # HTTP Headers