summaryrefslogtreecommitdiffstats
path: root/Doc/includes
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-07-26 14:54:51 (GMT)
committerGeorg Brandl <georg@python.org>2009-07-26 14:54:51 (GMT)
commit22b3431426349a424e3486c279db8b84cf671da0 (patch)
treedb3aa6b6addb5e07c53de6ff2a5e8250d472bb58 /Doc/includes
parent7a72b3ad7b02612254c7e256b8a67ce7ccf7994a (diff)
downloadcpython-22b3431426349a424e3486c279db8b84cf671da0.zip
cpython-22b3431426349a424e3486c279db8b84cf671da0.tar.gz
cpython-22b3431426349a424e3486c279db8b84cf671da0.tar.bz2
Merged revisions 74209 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74209 | georg.brandl | 2009-07-26 16:37:28 +0200 (So, 26 Jul 2009) | 1 line builtin -> built-in. ........
Diffstat (limited to 'Doc/includes')
-rw-r--r--Doc/includes/sqlite3/text_factory.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/includes/sqlite3/text_factory.py b/Doc/includes/sqlite3/text_factory.py
index 4c25b00..22c2970 100644
--- a/Doc/includes/sqlite3/text_factory.py
+++ b/Doc/includes/sqlite3/text_factory.py
@@ -31,7 +31,7 @@ cur.execute("select ?", ("this is latin1 and would normally create errors" +
row = cur.fetchone()
assert type(row[0]) == str
-# sqlite3 offers a builtin optimized text_factory that will return bytestring
+# sqlite3 offers a built-in 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,))