From 45223fd9cefe483daa4af7740f15c004486636eb Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 8 Jan 2020 21:48:44 +0100 Subject: Modernize Python exception syntax in tests Change the exception syntax used in the tests to use the more current except Exception as ex: rather than the old except Exception, ex: Since support for Python <2.6 has been removed, all supported versions now support the new style, and we can save one step in the Python 3 compatibility conversion. Reviewed-by: Tom Lane Discussion: https://www.postgresql.org/message-id/flat/98b69261-298c-13d2-f34d-836fd9c29b21%402ndquadrant.com --- src/pl/plpython/sql/plpython_error.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/pl/plpython/sql/plpython_error.sql') diff --git a/src/pl/plpython/sql/plpython_error.sql b/src/pl/plpython/sql/plpython_error.sql index d712eb1078f..88d6936fd0d 100644 --- a/src/pl/plpython/sql/plpython_error.sql +++ b/src/pl/plpython/sql/plpython_error.sql @@ -82,7 +82,7 @@ CREATE FUNCTION invalid_type_caught(a text) RETURNS text q = "SELECT fname FROM users WHERE lname = $1" try: SD["plan"] = plpy.prepare(q, [ "test" ]) - except plpy.SPIError, ex: + except plpy.SPIError as ex: plpy.notice(str(ex)) return None rv = plpy.execute(SD["plan"], [ a ]) @@ -104,7 +104,7 @@ CREATE FUNCTION invalid_type_reraised(a text) RETURNS text q = "SELECT fname FROM users WHERE lname = $1" try: SD["plan"] = plpy.prepare(q, [ "test" ]) - except plpy.SPIError, ex: + except plpy.SPIError as ex: plpy.error(str(ex)) rv = plpy.execute(SD["plan"], [ a ]) if len(rv): @@ -247,9 +247,9 @@ $$ from plpy import spiexceptions try: plpy.execute("insert into specific values (%s)" % (i or "NULL")); -except spiexceptions.NotNullViolation, e: +except spiexceptions.NotNullViolation as e: plpy.notice("Violated the NOT NULL constraint, sqlstate %s" % e.sqlstate) -except spiexceptions.UniqueViolation, e: +except spiexceptions.UniqueViolation as e: plpy.notice("Violated the UNIQUE constraint, sqlstate %s" % e.sqlstate) $$ LANGUAGE plpythonu; -- cgit v1.2.3