diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2020-01-08 21:48:44 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2020-01-08 22:47:22 +0100 |
| commit | 45223fd9cefe483daa4af7740f15c004486636eb (patch) | |
| tree | cd00580944d074ca0e22aad5fde3a79d58d5f274 /src/pl/plpython/sql/plpython_error.sql | |
| parent | 37f21ed132d1c5aee88e81fee0a0b7e735673d35 (diff) | |
| download | postgresql-45223fd9cefe483daa4af7740f15c004486636eb.tar.gz postgresql-45223fd9cefe483daa4af7740f15c004486636eb.zip | |
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 <tgl@sss.pgh.pa.us>
Discussion: https://www.postgresql.org/message-id/flat/98b69261-298c-13d2-f34d-836fd9c29b21%402ndquadrant.com
Diffstat (limited to 'src/pl/plpython/sql/plpython_error.sql')
| -rw-r--r-- | src/pl/plpython/sql/plpython_error.sql | 8 |
1 files changed, 4 insertions, 4 deletions
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; |