diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2009-08-24 20:25:25 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2009-08-24 20:25:25 +0000 |
| commit | 5dff93638c4443d3afba017f64c9ade69e0fbd3b (patch) | |
| tree | f3d9c7456f569a2b68dc7e3227485d15c0d358dc /src/pl/plpython/expected/plpython_error.out | |
| parent | 8bed238c871fae205c5c6615f3b9ab8a039359e2 (diff) | |
Make PL/Python tests more compatible with Python 3
This changes a bunch of incidentially used constructs in the PL/Python
regression tests to equivalent constructs in cases where Python 3 no longer
supports the old syntax. Support for older Python versions is unchanged.
Diffstat (limited to 'src/pl/plpython/expected/plpython_error.out')
| -rw-r--r-- | src/pl/plpython/expected/plpython_error.out | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out index 8454b05e5ea..58f7b3a766e 100644 --- a/src/pl/plpython/expected/plpython_error.out +++ b/src/pl/plpython/expected/plpython_error.out @@ -45,7 +45,7 @@ CONTEXT: PL/Python function "exception_index_invalid_nested" */ CREATE FUNCTION invalid_type_uncaught(a text) RETURNS text AS -'if not SD.has_key("plan"): +'if "plan" not in SD: q = "SELECT fname FROM users WHERE lname = $1" SD["plan"] = plpy.prepare(q, [ "test" ]) rv = plpy.execute(SD["plan"], [ a ]) @@ -64,7 +64,7 @@ CONTEXT: PL/Python function "invalid_type_uncaught" */ CREATE FUNCTION invalid_type_caught(a text) RETURNS text AS -'if not SD.has_key("plan"): +'if "plan" not in SD: q = "SELECT fname FROM users WHERE lname = $1" try: SD["plan"] = plpy.prepare(q, [ "test" ]) @@ -87,7 +87,7 @@ CONTEXT: PL/Python function "invalid_type_caught" */ CREATE FUNCTION invalid_type_reraised(a text) RETURNS text AS -'if not SD.has_key("plan"): +'if "plan" not in SD: q = "SELECT fname FROM users WHERE lname = $1" try: SD["plan"] = plpy.prepare(q, [ "test" ]) @@ -108,7 +108,7 @@ CONTEXT: PL/Python function "invalid_type_reraised" */ CREATE FUNCTION valid_type(a text) RETURNS text AS -'if not SD.has_key("plan"): +'if "plan" not in SD: SD["plan"] = plpy.prepare("SELECT fname FROM users WHERE lname = $1", [ "text" ]) rv = plpy.execute(SD["plan"], [ a ]) if len(rv): |