[Python-checkins] r74767 - in python/branches/release31-maint: Doc/library/sqlite3.rst

[ezio.melotti]

Author: ezio.melotti
Date: Sun Sep 13 10:09:56 2009
New Revision: 74767

Log:
Merged revisions 74763 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r74763 | ezio.melotti | 2009-09-13 08:49:25 +0300 (Sun, 13 Sep 2009) | 1 line
  
  small fixes in the examples and in the markup
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/sqlite3.rst

Modified: python/branches/release31-maint/Doc/library/sqlite3.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/sqlite3.rst	(original)
+++ python/branches/release31-maint/Doc/library/sqlite3.rst	Sun Sep 13 10:09:56 2009
@@ -79,12 +79,12 @@
    >>> c = conn.cursor()
    >>> c.execute('select * from stocks order by price')
    >>> for row in c:
-   ...    print(row)
+   ...     print(row)
    ...
-   (u'2006-01-05', u'BUY', u'RHAT', 100, 35.14)
-   (u'2006-03-28', u'BUY', u'IBM', 1000, 45.0)
-   (u'2006-04-06', u'SELL', u'IBM', 500, 53.0)
-   (u'2006-04-05', u'BUY', u'MSOFT', 1000, 72.0)
+   ('2006-01-05', 'BUY', 'RHAT', 100, 35.14)
+   ('2006-03-28', 'BUY', 'IBM', 1000, 45.0)
+   ('2006-04-06', 'SELL', 'IBM', 500, 53.0)
+   ('2006-04-05', 'BUY', 'MSOFT', 1000, 72.0)
    >>>
 
 
@@ -589,18 +589,19 @@
     <sqlite3.Cursor object at 0x7f4e7dd8fa80>
     >>> r = c.fetchone()
     >>> type(r)
-    <type 'sqlite3.Row'>
-    >>> r
-    (u'2006-01-05', u'BUY', u'RHAT', 100.0, 35.14)
+    <class 'sqlite3.Row'>
+    >>> tuple(r)
+    ('2006-01-05', 'BUY', 'RHAT', 100.0, 35.14)
     >>> len(r)
     5
     >>> r[2]
-    u'RHAT'
+    'RHAT'
     >>> r.keys()
     ['date', 'trans', 'symbol', 'qty', 'price']
     >>> r['qty']
     100.0
-    >>> for member in r: print member
+    >>> for member in r:
+    ...     print(member)
     ...
     2006-01-05
     BUY
@@ -647,7 +648,7 @@
 +=============+=============================================+
 | ``NULL``    | :const:`None`                               |
 +-------------+---------------------------------------------+
-| ``INTEGER`` | :class`int`                                 |
+| ``INTEGER`` | :class:`int`                                |
 +-------------+---------------------------------------------+
 | ``REAL``    | :class:`float`                              |
 +-------------+---------------------------------------------+