merge
This commit is contained in:
commit
9af740b99a
|
@ -109,7 +109,7 @@ class FailureTestCase(unittest.TestCase):
|
|||
with foo: pass
|
||||
self.assertRaises(NameError, fooNotDeclared)
|
||||
|
||||
def testEnterAttributeError(self):
|
||||
def testEnterAttributeError1(self):
|
||||
class LacksEnter(object):
|
||||
def __exit__(self, type, value, traceback):
|
||||
pass
|
||||
|
@ -117,7 +117,16 @@ class FailureTestCase(unittest.TestCase):
|
|||
def fooLacksEnter():
|
||||
foo = LacksEnter()
|
||||
with foo: pass
|
||||
self.assertRaises(AttributeError, fooLacksEnter)
|
||||
self.assertRaisesRegexp(AttributeError, '__enter__', fooLacksEnter)
|
||||
|
||||
def testEnterAttributeError2(self):
|
||||
class LacksEnterAndExit(object):
|
||||
pass
|
||||
|
||||
def fooLacksEnterAndExit():
|
||||
foo = LacksEnterAndExit()
|
||||
with foo: pass
|
||||
self.assertRaisesRegexp(AttributeError, '__enter__', fooLacksEnterAndExit)
|
||||
|
||||
def testExitAttributeError(self):
|
||||
class LacksExit(object):
|
||||
|
@ -127,7 +136,7 @@ class FailureTestCase(unittest.TestCase):
|
|||
def fooLacksExit():
|
||||
foo = LacksExit()
|
||||
with foo: pass
|
||||
self.assertRaises(AttributeError, fooLacksExit)
|
||||
self.assertRaisesRegexp(AttributeError, '__exit__', fooLacksExit)
|
||||
|
||||
def assertRaisesSyntaxError(self, codestr):
|
||||
def shouldRaiseSyntaxError(s):
|
||||
|
|
|
@ -15,6 +15,10 @@ Core and Builtins
|
|||
|
||||
- Issue #28532: Show sys.version when -V option is supplied twice.
|
||||
|
||||
- Issue #27100: The with-statement now checks for __enter__ before it
|
||||
checks for __exit__. This gives less confusing error messages when
|
||||
both methods are missing. Patch by Jonathan Ellington.
|
||||
|
||||
- Issue #28746: Fix the set_inheritable() file descriptor method on platforms
|
||||
that do not have the ioctl FIOCLEX and FIONCLEX commands.
|
||||
|
||||
|
|
|
@ -3141,15 +3141,15 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
|
|||
_Py_IDENTIFIER(__exit__);
|
||||
_Py_IDENTIFIER(__enter__);
|
||||
PyObject *mgr = TOP();
|
||||
PyObject *exit = special_lookup(mgr, &PyId___exit__), *enter;
|
||||
PyObject *enter = special_lookup(mgr, &PyId___enter__), *exit;
|
||||
PyObject *res;
|
||||
if (enter == NULL)
|
||||
goto error;
|
||||
exit = special_lookup(mgr, &PyId___exit__);
|
||||
if (exit == NULL)
|
||||
goto error;
|
||||
SET_TOP(exit);
|
||||
enter = special_lookup(mgr, &PyId___enter__);
|
||||
Py_DECREF(mgr);
|
||||
if (enter == NULL)
|
||||
goto error;
|
||||
res = PyObject_CallFunctionObjArgs(enter, NULL);
|
||||
Py_DECREF(enter);
|
||||
if (res == NULL)
|
||||
|
|
Loading…
Reference in New Issue