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.
This commit is contained in:
Peter Eisentraut
2012-05-11 23:01:15 +03:00
parent 63fecc9177
commit 2cfb1c6f77
6 changed files with 38 additions and 16 deletions

View File

@ -75,8 +75,14 @@ if 'relid' in TD:
skeys = list(TD.keys())
skeys.sort()
for key in skeys:
val = TD[key]
plpy.notice("TD[" + key + "] => " + str(val))
val = TD[key]
if not isinstance(val, dict):
plpy.notice("TD[" + key + "] => " + str(val))
else:
# print dicts the hard way because otherwise the order is implementation-dependent
valkeys = list(val.keys())
valkeys.sort()
plpy.notice("TD[" + key + "] => " + '{' + ', '.join([repr(k) + ': ' + repr(val[k]) for k in valkeys]) + '}')
return None