# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 2006-10-12 17:04:11
# Node ID 4bad632913d8a2281fca44b2b3f7d454a72838ce
# Parent  751df21dad72564ff09614b9f4d23df6ff4d4f6e

python2.5 PyArg_ParseTuple fix

Python 2.5 doesn't like it when we mix str objects and the "t#" format
in PyArg_ParseTuple. Change it to use "s#". Tested with python 2.3, 2.4
and 2.5.

diff --git a/mercurial/base85.c b/mercurial/base85.c
--- a/mercurial/base85.c
+++ b/mercurial/base85.c
@@ -35,7 +35,7 @@ b85encode(PyObject *self, PyObject *args
 	unsigned int acc, val, ch;
         int pad = 0;
 
-	if (!PyArg_ParseTuple(args, "t#|i", &text, &len, &pad))
+	if (!PyArg_ParseTuple(args, "s#|i", &text, &len, &pad))
 		return NULL;
 
         if (pad)
@@ -82,7 +82,7 @@ b85decode(PyObject *self, PyObject *args
 	int len, i, j, olen, c, cap;
 	unsigned int acc;
 
-	if (!PyArg_ParseTuple(args, "t#", &text, &len))
+	if (!PyArg_ParseTuple(args, "s#", &text, &len))
 		return NULL;
 
 	olen = len / 5 * 4;
diff --git a/mercurial/bdiff.c b/mercurial/bdiff.c
--- a/mercurial/bdiff.c
+++ b/mercurial/bdiff.c
@@ -308,7 +308,7 @@ static PyObject *bdiff(PyObject *self, P
 	char encode[12], *rb;
 	int an, bn, len = 0, la, lb;
 
-	if (!PyArg_ParseTuple(args, "t#t#:bdiff", &sa, &la, &sb, &lb))
+	if (!PyArg_ParseTuple(args, "s#s#:bdiff", &sa, &la, &sb, &lb))
 		return NULL;
 
 	an = splitlines(sa, la, &al);