Mercurial > p > mysql-python > mysqldb-2
changeset 44:2b9a9814daab MySQLdb
_PyTuple_Resize is stable since 2.2, so we don't need the macro MyTuple_Resize
| author | kylev |
|---|---|
| date | Tue, 17 Feb 2009 06:02:33 +0000 |
| parents | e36420b7ae6e |
| children | 28e9be1ca559 |
| files | _mysql.h _mysql_results.c |
| diffstat | 2 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/_mysql.h Tue Feb 17 05:55:48 2009 +0000 +++ b/_mysql.h Tue Feb 17 06:02:33 2009 +0000 @@ -13,7 +13,6 @@ #include "mysqld_error.h" #include "errmsg.h" -#define MyTuple_Resize(t,n,d) _PyTuple_Resize(t, n) #define MyAlloc(s,t) (s *) t.tp_alloc(&t,0) #define MyFree(ob) ob->ob_type->tp_free((PyObject *)ob)
--- a/_mysql_results.c Tue Feb 17 05:55:48 2009 +0000 +++ b/_mysql_results.c Tue Feb 17 06:02:33 2009 +0000 @@ -381,7 +381,7 @@ goto error; } if (!row) { - if (MyTuple_Resize(r, i, 0) == -1) goto error; + if (_PyTuple_Resize(r, i) == -1) goto error; break; } v = convert_row(self, row); @@ -431,7 +431,7 @@ convert_row = row_converters[how]; if (maxrows) { if (!(r = PyTuple_New(maxrows))) goto error; - rowsadded = _mysql__fetch_row(self, &r, skiprows, maxrows, + rowsadded = _mysql__fetch_row(self, &r, skiprows, maxrows, convert_row); if (rowsadded == -1) goto error; } else { @@ -444,7 +444,7 @@ if (rowsadded == -1) goto error; skiprows += rowsadded; if (rowsadded < maxrows) break; - if (MyTuple_Resize(&r, skiprows+maxrows, 0) == -1) + if (_PyTuple_Resize(&r, skiprows + maxrows) == -1) goto error; } } else {