From: Antoine Pitrou Date: Tue, 4 Oct 2011 11:35:28 +0000 (+0200) Subject: Issue #13099: Fix sqlite3.Cursor.lastrowid under a Turkish locale. X-Git-Tag: v3.2.3rc1~536 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1665d2c75fcfe5097983c13fdf66fd5e766890c2;p=thirdparty%2FPython%2Fcpython.git Issue #13099: Fix sqlite3.Cursor.lastrowid under a Turkish locale. Reported and diagnosed by Thomas Kluyver. --- diff --git a/Misc/ACKS b/Misc/ACKS index 4f2ea13f6e50..3dc3de137031 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -488,6 +488,7 @@ Bastian Kleineidam Bob Kline Matthias Klose Jeremy Kloth +Thomas Kluyver Kim Knapp Lenny Kneler Pat Knight diff --git a/Misc/NEWS b/Misc/NEWS index dd98665c884d..6b558b49e84d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -36,6 +36,9 @@ Core and Builtins Library ------- +- Issue #13099: Fix sqlite3.Cursor.lastrowid under a Turkish locale. + Reported and diagnosed by Thomas Kluyver. + - Issue #13087: BufferedReader.seek() now always raises UnsupportedOperation if the underlying raw stream is unseekable, even if the seek could be satisfied using the internal buffer. Patch by John O'Connor. diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index 97908a309396..b9a4358b1a9d 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -55,8 +55,8 @@ static pysqlite_StatementKind detect_statement_type(const char* statement) dst = buf; *dst = 0; - while (isalpha(*src) && dst - buf < sizeof(buf) - 2) { - *dst++ = tolower(*src++); + while (Py_ISALPHA(*src) && dst - buf < sizeof(buf) - 2) { + *dst++ = Py_TOLOWER(*src++); } *dst = 0;