[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/66c16de4ab9d
changeset:   73231:66c16de4ab9d
parent:      73228:2096158376e5
parent:      73230:bc16d1300ee1
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Mon Oct 31 02:42:06 2011 +0100
summary:
  merge with 3.2

files:
  Doc/includes/sqlite3/ctx_manager.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/includes/sqlite3/ctx_manager.py b/Doc/includes/sqlite3/ctx_manager.py
--- a/Doc/includes/sqlite3/ctx_manager.py
+++ b/Doc/includes/sqlite3/ctx_manager.py
@@ -8,7 +8,7 @@
     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",))

-- 
Repository URL: http://hg.python.org/cpython