PL/Python: Fix tests for older Python versions

petere · petere · commit f498704346a4 · 2018-01-22T12:09:52.000-05:00
Commit 8561e48 neglected to handle older Python versions that don't support the "with" statement. So write the tests in a way that older versions can handle as well.
diff --git a/src/pl/plpython/expected/plpython_transaction.out b/src/pl/plpython/expected/plpython_transaction.out
@@ -95,8 +95,9 @@ CONTEXT:  Traceback (most recent call last):
 PL/Python function "transaction_test4"
 -- commit inside subtransaction (prohibited)
 DO LANGUAGE plpythonu $$
-with plpy.subtransaction():
-    plpy.commit()
+s = plpy.subtransaction()
+s.enter()
+plpy.commit()
 $$;
 WARNING:  forcibly aborting a subtransaction that has not been exited
 ERROR:  cannot commit while a subtransaction is active
diff --git a/src/pl/plpython/sql/plpython_transaction.sql b/src/pl/plpython/sql/plpython_transaction.sql
@@ -79,8 +79,9 @@ SELECT transaction_test4();
 
 -- commit inside subtransaction (prohibited)
 DO LANGUAGE plpythonu $$
-with plpy.subtransaction():
-    plpy.commit()
+s = plpy.subtransaction()
+s.enter()
+plpy.commit()
 $$;
 
 
