From 2cfb1c6f77734db81b6e74bcae630f93b94f69be Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 11 May 2012 23:01:15 +0300
Subject: PL/Python: Adjust the regression tests for Python 3.3

The string representation of ImportError changed.  Remove printing
that; it's not necessary for the test.

The order in which members of a dict are printed changed.  But this
was always implementation-dependent, so we have just been lucky for a
long time.  Do the printing the hard way to ensure sorted order.
---
 src/pl/plpython/sql/plpython_import.sql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/pl/plpython/sql/plpython_import.sql')

diff --git a/src/pl/plpython/sql/plpython_import.sql b/src/pl/plpython/sql/plpython_import.sql
index 477af328d1..d4a4a24af4 100644
--- a/src/pl/plpython/sql/plpython_import.sql
+++ b/src/pl/plpython/sql/plpython_import.sql
@@ -4,8 +4,7 @@ CREATE FUNCTION import_fail() returns text
     AS
 'try:
 	import foosocket
-except Exception, ex:
-	plpy.notice("import socket failed -- %s" % str(ex))
+except ImportError:
 	return "failed as expected"
 return "succeeded, that wasn''t supposed to happen"'
     LANGUAGE plpythonu;
-- 
cgit v1.2.1

