From 2b8afe6193c6e64d956c400397c421be4065acaa Mon Sep 17 00:00:00 2001
From: Neil Conway <neilc@samurai.com>
Date: Tue, 28 Feb 2006 20:56:14 +0000
Subject: Tweak the error message emitted when a void-returning PL/Python
 function does not return None, per suggestion from Tom.

---
 src/pl/plpython/plpython.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/pl/plpython/plpython.c')

diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 14c805a29ef..cea843f343a 100644
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -29,7 +29,7 @@
  * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * IDENTIFICATION
- *	$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.72 2006/02/28 20:03:52 neilc Exp $
+ *	$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.73 2006/02/28 20:56:14 neilc Exp $
  *
  *********************************************************************
  */
@@ -769,8 +769,8 @@ PLy_function_handler(FunctionCallInfo fcinfo, PLyProcedure * proc)
 			if (plrv != Py_None)
 				ereport(ERROR,
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
-						 errmsg("unexpected return value from plpython procedure"),
-						 errdetail("void-returning functions must return \"None\"")));
+						 errmsg("invalid return value from plpython function"),
+						 errdetail("Functions returning type \"void\" must return \"None\".")));
 
 			fcinfo->isnull = false;
 			rv = (Datum) 0;
-- 
cgit v1.2.3