From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 1 Sep 2022 21:55:37 +0000 (-0700)
Subject: gh-96168: Improve sqlite3 dict_factory example (GH-96457)
X-Git-Tag: v3.11.0rc2~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fca8e94dbfc4a9164007063ddf7f2d72e75a4dc2;p=thirdparty%2FPython%2Fcpython.git

gh-96168: Improve sqlite3 dict_factory example (GH-96457)


Co-authored-by: C.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
(cherry picked from commit 91f40f3f78d6016a283989e32ec3d1fb61bcebca)

Co-authored-by: Erlend E. Aasland <erlend.aasland@innova.no>
---

diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index fc288f6f7399..aace339e3a4d 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -588,25 +588,16 @@ Connection objects
 
       Example:
 
-      .. testcode::
-
-         def dict_factory(cursor, row):
-             d = {}
-             for idx, col in enumerate(cursor.description):
-                 d[col[0]] = row[idx]
-             return d
-
-         con = sqlite3.connect(":memory:")
-         con.row_factory = dict_factory
-         cur = con.execute("SELECT 1 AS a")
-         print(cur.fetchone()["a"])
-
-         con.close()
-
-      .. testoutput::
-         :hide:
+      .. doctest::
 
-         1
+         >>> def dict_factory(cursor, row):
+         ...     col_names = [col[0] for col in cursor.description]
+         ...     return {key: value for key, value in zip(col_names, row)}
+         >>> con = sqlite3.connect(":memory:")
+         >>> con.row_factory = dict_factory
+         >>> for row in con.execute("SELECT 1 AS a, 2 AS b"):
+         ...     print(row)
+         {'a': 1, 'b': 2}
 
       If returning a tuple doesn't suffice and you want name-based access to
       columns, you should consider setting :attr:`row_factory` to the