summaryrefslogtreecommitdiffstats
path: root/Doc/includes
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2011-10-31 01:42:06 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2011-10-31 01:42:06 (GMT)
commit9bf59aa103074ee0e926ef74743bb1eaa8229128 (patch)
tree0b9d803a1b31ab6f60fcffdb845bd50e8de46d70 /Doc/includes
parentb6f019a0801847c0ebb82ebf10179d59814f0eac (diff)
parent567493fe263e4e4ee50fcb0648ce3f2bbfc84db7 (diff)
downloadcpython-9bf59aa103074ee0e926ef74743bb1eaa8229128.zip
cpython-9bf59aa103074ee0e926ef74743bb1eaa8229128.tar.gz
cpython-9bf59aa103074ee0e926ef74743bb1eaa8229128.tar.bz2
merge with 3.2
Diffstat (limited to 'Doc/includes')
-rw-r--r--Doc/includes/sqlite3/ctx_manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/includes/sqlite3/ctx_manager.py b/Doc/includes/sqlite3/ctx_manager.py
index b8e4332..7af4ad1 100644
--- a/Doc/includes/sqlite3/ctx_manager.py
+++ b/Doc/includes/sqlite3/ctx_manager.py
@@ -8,7 +8,7 @@ with con:
con.execute("insert into person(firstname) values (?)", ("Joe",))
# con.rollback() is called after the with block finishes with an exception, the
-# exception is still raised and must be catched
+# exception is still raised and must be caught
try:
with con:
con.execute("insert into person(firstname) values (?)", ("Joe",))