commit 3cfdd9c1d53bdcc95b3779caaa2ab5953b604797
author Georg Brandl <georg@python.org> Thu Jun 04 10:21:10 2009 +0000
committer Georg Brandl <georg@python.org> Thu Jun 04 10:21:10 2009 +0000
tree bc4ebcb01dabdce9bd671324faef32000f3176b6
parent 706824f19f734e5e567f32d989376547c0ae08da

Merged revisions 73186,73206,73212 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73186 | georg.brandl | 2009-06-03 23:21:09 +0200 (Mi, 03 Jun 2009) | 1 line

  #6174: fix indentation in code example.
........
  r73206 | georg.brandl | 2009-06-04 11:15:12 +0200 (Do, 04 Jun 2009) | 1 line

  #3584: ignore trailing newlines when placing the caret for a SyntaxError location.
........
  r73212 | georg.brandl | 2009-06-04 12:10:41 +0200 (Do, 04 Jun 2009) | 1 line

  Better name for "Ctor".
........

Lib/test/test_with.py

diff --git a/Lib/test/test_with.py b/Lib/test/test_with.py
index 105be8b..ae2fa4d 100644
--- a/Lib/test/test_with.py
+++ b/Lib/test/test_with.py
@@ -677,7 +677,7 @@
             if self.gobble:
                 return True
 
-    class CtorRaises(object):
+    class InitRaises(object):
         def __init__(self): raise RuntimeError()
 
     class EnterRaises(object):
@@ -697,7 +697,7 @@
 
     def testExceptionInExprList(self):
         try:
-            with self.Dummy() as a, self.CtorRaises():
+            with self.Dummy() as a, self.InitRaises():
                 pass
         except:
             pass