[SQL-CVS] r3022 - SQLObject/trunk/sqlobject/mysql
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
|
From: <sub...@co...> - 2007-10-03 21:59:16
|
Author: novalis
Date: 2007-10-03 15:59:07 -0600 (Wed, 03 Oct 2007)
New Revision: 3022
Modified:
SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
Log:
never convert to unicode at all for mysql connections at query time.
Modified: SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mysql/mysqlconnection.py 2007-10-02 15:42:38 UTC (rev 3021)
+++ SQLObject/trunk/sqlobject/mysql/mysqlconnection.py 2007-10-03 21:59:07 UTC (rev 3022)
@@ -109,11 +109,7 @@
try:
# For MySQLdb 1.2.1 and later, we go
# encoding->unicode->charset (in the mysql db)
- if self.need_unicode and not isinstance(query, unicode):
- try:
- query = unicode(query, self.encoding)
- except UnicodeError:
- pass
+
return cursor.execute(query)
except MySQLdb.OperationalError, e:
if e.args[0] in (MySQLdb.constants.CR.SERVER_GONE_ERROR, MySQLdb.constants.CR.SERVER_LOST):
|