[Python-checkins] cpython (merge 3.5 -> default): #26250: merge with 3.5.
ezio.melotti
python-checkins at python.org
Fri Mar 18 14:13:17 EDT 2016
https://hg.python.org/cpython/rev/6fed752fd88e
changeset: 100592:6fed752fd88e
parent: 100590:364895e54bb0
parent: 100591:52660878c833
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Fri Mar 18 20:11:30 2016 +0200
summary:
#26250: merge with 3.5.
files:
Doc/library/sqlite3.rst | 12 ++++++++++++
Misc/ACKS | 1 +
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -627,6 +627,18 @@
It is set for ``SELECT`` statements without any matching rows as well.
+ .. attribute:: connection
+
+ This read-only attribute provides the SQLite database :class:`Connection`
+ used by the :class:`Cursor` object. A :class:`Cursor` object created by
+ calling :meth:`con.cursor() <Connection.cursor>` will have a
+ :attr:`connection` attribute that refers to *con*::
+
+ >>> con = sqlite3.connect(":memory:")
+ >>> cur = con.cursor()
+ >>> cur.connection == con
+ True
+
.. _sqlite3-row-objects:
Row Objects
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1178,6 +1178,7 @@
Abhilash Raj
Shorya Raj
Jeff Ramnani
+Varpu Rantala
Brodie Rao
Senko Rasic
Antti Rasinen
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list