[Python-checkins] cpython (merge 3.2 -> default): Merge branch '3.2'

Thu Mar 1 20:51:22 CET 2012

http://hg.python.org/cpython/rev/82032c64dd89
changeset: 75362:82032c64dd89
parent: 75359:73be78d21003
parent: 75361:5f492397ccb8
user: Petri Lehtinen <petri at digip.org>
date: Thu Mar 01 21:49:39 2012 +0200
summary:
 Merge branch '3.2'
Issue #13491.
files:
 Doc/library/sqlite3.rst | 16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -3,7 +3,7 @@
 
 .. module:: sqlite3
 :synopsis: A DB-API 2.0 implementation using SQLite 3.x.
-.. sectionauthor:: Gerhard HÃ¤ring <gh at ghaering.de>
+.. sectionauthor:: Gerhard Häring <gh at ghaering.de>
 
 
 SQLite is a C library that provides a lightweight disk-based database that
@@ -20,6 +20,7 @@
 represents the database. Here the data will be stored in the
 :file:`/tmp/example` file::
 
+ import sqlite3
 conn = sqlite3.connect('/tmp/example')
 
 You can also supply the special name ``:memory:`` to create a database in RAM.
@@ -56,7 +57,7 @@
 
 # Never do this -- insecure!
 symbol = 'IBM'
- c.execute("... where symbol = '%s'" % symbol)
+ c.execute("select * from stocks where symbol = '%s'" % symbol)
 
 # Do this instead
 t = (symbol,)
@@ -64,7 +65,7 @@
 
 # Larger example
 for t in [('2006-03-28', 'BUY', 'IBM', 1000, 45.00),
- ('2006-04-05', 'BUY', 'MSOFT', 1000, 72.00),
+ ('2006-04-05', 'BUY', 'MSFT', 1000, 72.00),
 ('2006-04-06', 'SELL', 'IBM', 500, 53.00),
 ]:
 c.execute('insert into stocks values (?,?,?,?,?)', t)
@@ -271,7 +272,6 @@
 calling the cursor method, then calls the cursor's :meth:`executemany
 <Cursor.executemany>` method with the parameters given.
 
-
 .. method:: Connection.executescript(sql_script)
 
 This is a nonstandard shortcut that creates an intermediate cursor object by
@@ -392,22 +392,22 @@
 aggregates or whole new virtual table implementations. One well-known
 extension is the fulltext-search extension distributed with SQLite.
 
+ Loadable extensions are disabled by default. See [#f1]_.
+
 .. versionadded:: 3.2
 
 .. literalinclude:: ../includes/sqlite3/load_extension.py
 
- Loadable extensions are disabled by default. See [#f1]_.
-
 .. method:: Connection.load_extension(path)
 
 This routine loads a SQLite extension from a shared library. You have to
 enable extension loading with :meth:`enable_load_extension` before you can
 use this routine.
 
+ Loadable extensions are disabled by default. See [#f1]_.
+
 .. versionadded:: 3.2
 
- Loadable extensions are disabled by default. See [#f1]_.
-
 .. attribute:: Connection.row_factory
 
 You can change this attribute to a callable that accepts the cursor and the
-- 
Repository URL: http://hg.python.org/cpython
