merge 3.2

This commit is contained in:
Benjamin Peterson 2012-04-02 14:25:55 -04:00
commit cbb290af08

View file

@ -132,7 +132,6 @@ def test_save_exception_state_on_error(self):
# See issue #14474
def task():
started.release()
sys.stderr = stderr
raise SyntaxError
def mywrite(self, *args):
try: