<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
<META NAME="GENERATOR" CONTENT="GtkHTML/3.0.10">
</HEAD>
<BODY>
Thanks to Kavous Bojnourdi for pointing out that the pg client library has functions that do what I was trying to do - this means more code reuse (which is nice). Here is my version of his version of my patch, with two changes incorporated. Firstly the unnecessary output variable and the memory copying were removed from both functions. Secondly the pgbytea_unescape called Py_BuildValue with an "s", rather than an "s#" argument, leaving it unable to cope with any "premature" zero bytes, which it would have assumed to be terminators.<BR>
<BR>
Here then is the third revision of the patch - once again thanks to Kavous for his input.<BR>
== CUT ==<BR>
diff -ur PyGreSQL-3.6-pre040830/pgmodule.c PyGreSQL-3.6-pre040830_mod/pgmodule.c<BR>
--- PyGreSQL-3.6-pre040830/pgmodule.c 2004-08-30 09:54:27.000000000 +0100<BR>
+++ PyGreSQL-3.6-pre040830_mod/pgmodule.c 2004-09-09 19:40:50.037533519 +0100<BR>
@@ -1550,6 +1550,48 @@<BR>
<BR>
return (PyObject *) npgobj;<BR>
}<BR>
+static PyObject *pgbytea_escape(PyObject *self, PyObject *args) {<BR>
+ char *str; /* Our argument */<BR>
+ int strlength; /* Length of string */<BR>
+ int tolen=0;<BR>
+ char * tmp;<BR>
+ PyObject *ret; /* String object to return */<BR>
+<BR>
+ if (!PyArg_ParseTuple(args, "s#", &str, &strlength))<BR>
+ return NULL;<BR>
+<BR>
+ tmp = PQescapeBytea(str,strlength,&tolen);<BR>
+ ret = Py_BuildValue("s", tmp);<BR>
+ PQfreemem(tmp);<BR>
+<BR>
+ if(!ret)<BR>
+ /* Pass on exception */<BR>
+ return NULL;<BR>
+<BR>
+ return ret;<BR>
+}<BR>
+<BR>
+static PyObject *pgbytea_unescape(PyObject *self, PyObject *args) {<BR>
+ char *str; /* Our argument */<BR>
+ int strlength; /* Length of string */<BR>
+ int tolen=0;<BR>
+ char * tmp;<BR>
+ <BR>
+ PyObject *ret; /* String object to return */<BR>
+<BR>
+ if (!PyArg_ParseTuple(args, "s#", &str, &strlength))<BR>
+ return NULL;<BR>
+ <BR>
+ tmp = PQunescapeBytea(str,&tolen);<BR>
+ ret = Py_BuildValue("s#", tmp, tolen);<BR>
+ PQfreemem(tmp);<BR>
+<BR>
+ if(!ret)<BR>
+ /* Pass on exception */<BR>
+ return NULL;<BR>
+<BR>
+ return ret;<BR>
+}<BR>
<BR>
/* pgobject methods */<BR>
<BR>
@@ -3175,6 +3217,9 @@<BR>
<BR>
static struct PyMethodDef pg_methods[] = {<BR>
{"connect", (PyCFunction) pgconnect, 3, connect__doc__},<BR>
+ {"pgbytea_escape",pgbytea_escape,METH_VARARGS,"Escape bytea"},<BR>
+ {"pgbytea_unescape",pgbytea_unescape,METH_VARARGS,"UnEscape bytea"},<BR>
+ <BR>
<BR>
#ifdef DEFAULT_VARS<BR>
{"get_defhost", pggetdefhost, 1, getdefhost__doc__},<BR>
==CUT==<BR>
<BR>
Regards to all concerned,
<PRE><TABLE CELLSPACING="0" CELLPADDING="0" WIDTH="100%">
<TR>
<TD>
<PRE><FONT COLOR="#f80000" SIZE="2"> _____</FONT><FONT COLOR="#0000f8" SIZE="2">__ ___ </FONT><FONT COLOR="#f80000" SIZE="2"> ___ </FONT><FONT SIZE="2"> </FONT>
<FONT COLOR="#f80000" SIZE="2"> / ___/</FONT><FONT COLOR="#0000f8" SIZE="2"> / ___ _____/ (_)__</FONT><FONT SIZE="2"> </FONT><FONT COLOR="#f80000" SIZE="2"> / _ \</FONT><FONT COLOR="#0000f8" SIZE="2">__ _____ ___ ___ </FONT>
<FONT COLOR="#f80000" SIZE="2">/ /__</FONT><FONT COLOR="#0000f8" SIZE="2">/ _ \/ _ `/ __/ / / -_)</FONT><FONT SIZE="2"> </FONT><FONT COLOR="#f80000" SIZE="2">/ // /</FONT><FONT COLOR="#0000f8" SIZE="2"> // (_-</ _ \/ _ \</FONT>
<FONT COLOR="#f80000" SIZE="2">\___/</FONT><FONT COLOR="#0000f8" SIZE="2">_//_/\_,_/_/ /_/_/\__/</FONT><FONT SIZE="2"> </FONT><FONT COLOR="#f80000" SIZE="2">/____/</FONT><FONT COLOR="#0000f8" SIZE="2">\_, /___/\___/_//_/</FONT>
<FONT SIZE="2"> </FONT><FONT COLOR="#0000f8" SIZE="2"> /___/ </FONT><FONT SIZE="2"> </FONT>
<FONT COLOR="#000080">charlie at charlie dyson dot net</FONT></PRE>
</TD>
</TR>
</TABLE>
</PRE>
</BODY>
</HTML>