diff options
| author | Georg Brandl <georg@python.org> | 2009-05-25 21:13:36 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-05-25 21:13:36 (GMT) |
| commit | 8a1e4c4b6433522ff20528e87b642e4316bd2bd6 (patch) | |
| tree | 34f4e397b78bfa4d45ff63fd569b22a5320e4993 /Doc/includes | |
| parent | 0c31562a913e9a49842bd73c04847861c23774f1 (diff) | |
| download | cpython-8a1e4c4b6433522ff20528e87b642e4316bd2bd6.zip cpython-8a1e4c4b6433522ff20528e87b642e4316bd2bd6.tar.gz cpython-8a1e4c4b6433522ff20528e87b642e4316bd2bd6.tar.bz2 | |
Merged revisions 72661,72675-72677,72679,72712,72801,72820 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72661 | georg.brandl | 2009-05-15 10:03:03 +0200 (Fr, 15 Mai 2009) | 1 line
Fix example output for doctest-like demos.
........
r72675 | georg.brandl | 2009-05-16 13:13:21 +0200 (Sa, 16 Mai 2009) | 1 line
#6034: clarify __reversed__ doc.
........
r72676 | georg.brandl | 2009-05-16 13:14:46 +0200 (Sa, 16 Mai 2009) | 1 line
#6025: fix signature of parse().
........
r72677 | georg.brandl | 2009-05-16 13:18:55 +0200 (Sa, 16 Mai 2009) | 1 line
#6009: undocument default argument of Option as deprecated.
........
r72679 | georg.brandl | 2009-05-16 13:24:41 +0200 (Sa, 16 Mai 2009) | 1 line
Fix about and bugs pages to match real workflow.
........
r72712 | georg.brandl | 2009-05-17 10:55:00 +0200 (So, 17 Mai 2009) | 1 line
#5935: mention that BROWSER is looked for in PATH.
........
r72801 | georg.brandl | 2009-05-20 20:31:14 +0200 (Mi, 20 Mai 2009) | 1 line
#6055: refer to "sqlite3" consistently.
........
r72820 | georg.brandl | 2009-05-22 09:23:32 +0200 (Fr, 22 Mai 2009) | 1 line
Use raise X(y).
........
Diffstat (limited to 'Doc/includes')
| -rw-r--r-- | Doc/includes/sqlite3/text_factory.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/includes/sqlite3/text_factory.py b/Doc/includes/sqlite3/text_factory.py index 2dab8e4..4c25b00 100644 --- a/Doc/includes/sqlite3/text_factory.py +++ b/Doc/includes/sqlite3/text_factory.py @@ -13,7 +13,7 @@ cur.execute("select ?", (AUSTRIA,)) row = cur.fetchone() assert row[0] == AUSTRIA -# but we can make pysqlite always return bytestrings ... +# but we can make sqlite3 always return bytestrings ... con.text_factory = str cur.execute("select ?", (AUSTRIA,)) row = cur.fetchone() @@ -26,11 +26,12 @@ assert row[0] == AUSTRIA.encode("utf-8") # here we implement one that will ignore Unicode characters that cannot be # decoded from UTF-8 con.text_factory = lambda x: str(x, "utf-8", "ignore") -cur.execute("select ?", ("this is latin1 and would normally create errors" + "\xe4\xf6\xfc".encode("latin1"),)) +cur.execute("select ?", ("this is latin1 and would normally create errors" + + "\xe4\xf6\xfc".encode("latin1"),)) row = cur.fetchone() assert type(row[0]) == str -# pysqlite offers a builtin optimized text_factory that will return bytestring +# sqlite3 offers a builtin optimized text_factory that will return bytestring # objects, if the data is in ASCII only, and otherwise return unicode objects con.text_factory = sqlite3.OptimizedUnicode cur.execute("select ?", (AUSTRIA,)) |