From c6a7bc222175438fe845fdb4f8bfaa8aa269a3de Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 27 Dec 2013 01:54:54 -0500 Subject: [PATCH] BF(2.4): remove use of "with" for python 2.4 for now (since we list it as supported) --- testcases/servertestcase.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/testcases/servertestcase.py b/testcases/servertestcase.py index 34d5af0d..e05a7750 100644 --- a/testcases/servertestcase.py +++ b/testcases/servertestcase.py @@ -540,13 +540,19 @@ class TransmitterLogging(TransmitterBase): logSys.warn("After file moved") self.assertEqual(self.transm.proceed(["flushlogs"]), (0, "rolled over")) logSys.warn("After flushlogs") - with open(fn2,'r') as f: + # >py2.4: with open(fn2, 'r') as f: + f = open(fn2, 'r'); + if True: self.assertTrue(f.next().endswith("Before file moved\n")) self.assertTrue(f.next().endswith("After file moved\n")) self.assertRaises(StopIteration, f.next) - with open(fn,'r') as f: + f.close() + # >py2.4: with open(fn, 'r') as f: + f = open(fn, 'r'); + if True: self.assertTrue(f.next().endswith("After flushlogs\n")) self.assertRaises(StopIteration, f.next) + f.close() finally: os.remove(fn2) finally: