diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/sqlite/pysqlite.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/result.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/sqlite/pysqlite.py b/lib/sqlalchemy/dialects/sqlite/pysqlite.py index 32ee1299f..ad0dd5292 100644 --- a/lib/sqlalchemy/dialects/sqlite/pysqlite.py +++ b/lib/sqlalchemy/dialects/sqlite/pysqlite.py @@ -267,7 +267,8 @@ class SQLiteDialect_pysqlite(SQLiteDialect): } ) - description_encoding = None + if not util.py2k: + description_encoding = None driver = 'pysqlite' diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py index 65ce3b742..4261a5877 100644 --- a/lib/sqlalchemy/engine/result.py +++ b/lib/sqlalchemy/engine/result.py @@ -215,6 +215,8 @@ class ResultMetaData(object): processors.append(processor) rec = (processor, obj, i) +# name.encode('ascii') + # indexes as keys. This is only needed for the Python version of # RowProxy (the C version uses a faster path for integer indexes). primary_keymap[i] = rec |