Merged revisions 72661,72675-72677,72679,72712,72801,72820 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72661 | georg.brandl | 2009-05-15 10:03:03 +0200 (Fr, 15 Mai 2009) | 1 line
Fix example output for doctest-like demos.
........
r72675 | georg.brandl | 2009-05-16 13:13:21 +0200 (Sa, 16 Mai 2009) | 1 line
#6034: clarify __reversed__ doc.
........
r72676 | georg.brandl | 2009-05-16 13:14:46 +0200 (Sa, 16 Mai 2009) | 1 line
#6025: fix signature of parse().
........
r72677 | georg.brandl | 2009-05-16 13:18:55 +0200 (Sa, 16 Mai 2009) | 1 line
#6009: undocument default argument of Option as deprecated.
........
r72679 | georg.brandl | 2009-05-16 13:24:41 +0200 (Sa, 16 Mai 2009) | 1 line
Fix about and bugs pages to match real workflow.
........
r72712 | georg.brandl | 2009-05-17 10:55:00 +0200 (So, 17 Mai 2009) | 1 line
#5935: mention that BROWSER is looked for in PATH.
........
r72801 | georg.brandl | 2009-05-20 20:31:14 +0200 (Mi, 20 Mai 2009) | 1 line
#6055: refer to "sqlite3" consistently.
........
r72820 | georg.brandl | 2009-05-22 09:23:32 +0200 (Fr, 22 Mai 2009) | 1 line
Use raise X(y).
........
diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst
index ac2f2fd..ba80478 100644
--- a/Doc/library/ctypes.rst
+++ b/Doc/library/ctypes.rst
@@ -338,9 +338,9 @@
>>> printf("Hello, %s\n", "World!")
Hello, World!
14
- >>> printf("Hello, %S", u"World!")
+ >>> printf("Hello, %S\n", u"World!")
Hello, World!
- 13
+ 14
>>> printf("%d bottles of beer\n", 42)
42 bottles of beer
19
@@ -355,7 +355,7 @@
that they can be converted to the required C data type::
>>> printf("An int %d, a double %f\n", 1234, c_double(3.14))
- Integer 1234, double 3.1400001049
+ An int 1234, a double 3.140000
31
>>>
@@ -411,9 +411,9 @@
Traceback (most recent call last):
File "<stdin>", line 1, in ?
ArgumentError: argument 2: exceptions.TypeError: wrong type
- >>> printf("%s %d %f", "X", 2, 3)
- X 2 3.00000012
- 12
+ >>> printf("%s %d %f\n", "X", 2, 3)
+ X 2 3.000000
+ 13
>>>
If you have defined your own classes which you pass to function calls, you have