cpython: 6f8042107d76 (original) (raw)

Mercurial > cpython

changeset 102892:6f8042107d76

Issue #6057: Merge from 3.5 [#6057]

Berker Peksag berker.peksag@gmail.com
date	Thu, 25 Aug 2016 00:45:36 +0300
parents	8d13c1f33d21(current diff)1dbd1a9a6a9c(diff)
children	aa73c28c7ba1
files	Doc/library/sqlite3.rst Misc/ACKS
diffstat	2 files changed, 33 insertions(+), 2 deletions(-)[+] [-] Doc/library/sqlite3.rst 34 Misc/ACKS 1

line wrap: on

line diff

--- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -542,7 +542,7 @@ Cursor Objects .. literalinclude:: ../includes/sqlite3/execute_1.py :meth:execute will only execute a single SQL statement. If you try to execute

 more than one statement with it, it will raise an ``sqlite3.Warning``. Use[](#l1.7)

 more than one statement with it, it will raise an :exc:`.Warning`. Use[](#l1.8)
 :meth:`executescript` if you want to execute multiple SQL statements with one[](#l1.9)
 call.[](#l1.10)

@@ -605,7 +605,7 @@ Cursor Objects Close the cursor now (rather than whenever __del__ is called).

 The cursor will be unusable from this point forward; a ``ProgrammingError``[](#l1.16)

 The cursor will be unusable from this point forward; a :exc:`ProgrammingError`[](#l1.17)
 exception will be raised if any operation is attempted with the cursor.[](#l1.18)

.. attribute:: rowcount @@ -726,6 +726,36 @@ Now we plug :class:Row in:: 35.14 +.. _sqlite3-exceptions: + +Exceptions +---------- + +.. exception:: Warning +

A subclass of :exc:Exception. +

+.. exception:: Error +

The base class of the other exceptions in this module. It is a subclass
of :exc:Exception. +

+.. exception:: DatabaseError +

Exception raised for errors that are related to the database. +

+.. exception:: IntegrityError +

Exception raised when the relational integrity of the database is affected,
e.g. a foreign key check fails. It is a subclass of :exc:DatabaseError. +

+.. exception:: ProgrammingError +

Exception raised for programming errors, e.g. table not found or already
exists, syntax error in the SQL statement, wrong number of parameters
specified, etc. It is a subclass of :exc:DatabaseError. +

+ .. _sqlite3-types: SQLite and Python types

--- a/Misc/ACKS +++ b/Misc/ACKS @@ -1377,6 +1377,7 @@ Shiyao Ma Alex Shkop Joel Shprentz Yue Shuaijie +Jaysinh Shukla Terrel Shumway Eric Siegerman Paul Sijben