Merged revisions 63361-63373,63375,63377-63380 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63361 | alexandre.vassalotti | 2008-05-16 03:14:08 -0400 (Fri, 16 May 2008) | 2 lines
Rename the test file of reprlib.
........
r63364 | georg.brandl | 2008-05-16 05:34:48 -0400 (Fri, 16 May 2008) | 2 lines
Make generator repr consistent with function and code object repr.
........
r63365 | georg.brandl | 2008-05-16 05:47:29 -0400 (Fri, 16 May 2008) | 2 lines
#2869: remove parameter from signature.
........
r63366 | christian.heimes | 2008-05-16 06:23:31 -0400 (Fri, 16 May 2008) | 1 line
Fixed #2870: cmathmodule.c compile error
........
r63367 | christian.heimes | 2008-05-16 07:28:56 -0400 (Fri, 16 May 2008) | 1 line
Following Amaury's advice
........
r63368 | georg.brandl | 2008-05-16 09:10:15 -0400 (Fri, 16 May 2008) | 2 lines
#2890: support os.O_ASYNC and fcntl.FASYNC.
........
r63369 | georg.brandl | 2008-05-16 09:18:50 -0400 (Fri, 16 May 2008) | 2 lines
#2845: fix copy2's docs.
........
r63370 | georg.brandl | 2008-05-16 09:24:29 -0400 (Fri, 16 May 2008) | 2 lines
Don't allow keyword arguments to reversed().
........
r63373 | georg.brandl | 2008-05-16 09:41:26 -0400 (Fri, 16 May 2008) | 2 lines
Document O_ASYNC addition.
........
r63380 | georg.brandl | 2008-05-16 13:33:13 -0400 (Fri, 16 May 2008) | 2 lines
Fix reprlib docs.
........
diff --git a/Doc/library/calendar.rst b/Doc/library/calendar.rst
index 112a672..d575228 100644
--- a/Doc/library/calendar.rst
+++ b/Doc/library/calendar.rst
@@ -35,7 +35,7 @@
:class:`Calendar` instances have the following methods:
- .. method:: iterweekdays(weekday)
+ .. method:: iterweekdays()
Return an iterator for the week day numbers that will be used for one
week. The first value from the iterator will be the same as the value of
diff --git a/Doc/library/datatypes.rst b/Doc/library/datatypes.rst
index f561cb8..99d062b 100644
--- a/Doc/library/datatypes.rst
+++ b/Doc/library/datatypes.rst
@@ -31,4 +31,4 @@
types.rst
copy.rst
pprint.rst
- repr.rst
+ reprlib.rst
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 551424d..2badfd3 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -613,7 +613,8 @@
combined using the bitwise OR operator ``|``. Availability: Windows.
-.. data:: O_DIRECT
+.. data:: O_ASYNC
+ O_DIRECT
O_DIRECTORY
O_NOFOLLOW
O_NOATIME
diff --git a/Doc/library/reprlib.rst b/Doc/library/reprlib.rst
index 84fd6fb..a0664c7 100644
--- a/Doc/library/reprlib.rst
+++ b/Doc/library/reprlib.rst
@@ -1,6 +1,6 @@
-
:mod:`reprlib` --- Alternate :func:`repr` implementation
-=====================================================
+========================================================
+
.. module:: reprlib
:synopsis: Alternate repr() implementation with size limits.
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index a3ab387..5ab2f29 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -73,8 +73,9 @@
.. function:: copy2(src, dst)
- Similar to :func:`copy`, but last access time and last modification time are
- copied as well. This is similar to the Unix command :program:`cp -p`.
+ Similar to :func:`copy`, but metadata is copied as well -- in fact, this is just
+ :func:`copy` followed by :func:`copystat`. This is similar to the
+ Unix command :program:`cp -p`.
.. function:: copytree(src, dst[, symlinks])