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".
........
This commit is contained in:
Georg Brandl 2009-06-04 10:21:10 +00:00
parent 706824f19f
commit 3cfdd9c1d5
3 changed files with 10 additions and 10 deletions

View file

@ -677,7 +677,7 @@ class NestedWith(unittest.TestCase):
if self.gobble:
return True
class CtorRaises(object):
class InitRaises(object):
def __init__(self): raise RuntimeError()
class EnterRaises(object):
@ -697,7 +697,7 @@ class NestedWith(unittest.TestCase):
def testExceptionInExprList(self):
try:
with self.Dummy() as a, self.CtorRaises():
with self.Dummy() as a, self.InitRaises():
pass
except:
pass