From 8aa95fa2cd0e15b77af3e5976436adc6ed6123b9 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 27 Jan 2016 12:41:01 -0500 Subject: [PATCH] Revert "- dont set up integer index in keymap if we're on cexts" This reverts commit de0d144a395c31eb74084177df95a4858b830f88. Apparently the test suite is not using the cextensions correctly at the moment. --- lib/sqlalchemy/engine/result.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py index 39f4fc50c9..cc4ac74cd5 100644 --- a/lib/sqlalchemy/engine/result.py +++ b/lib/sqlalchemy/engine/result.py @@ -35,10 +35,7 @@ except ImportError: try: from sqlalchemy.cresultproxy import BaseRowProxy - _baserowproxy_usecext = True except ImportError: - _baserowproxy_usecext = False - class BaseRowProxy(object): __slots__ = ('_parent', '_row', '_processors', '_keymap') @@ -213,13 +210,11 @@ class ResultMetaData(object): context, cursor_description, result_columns, num_ctx_cols, cols_are_ordered, textual_ordered) - self._keymap = {} - if not _baserowproxy_usecext: - # keymap indexes by integer index... - self._keymap.update([ - (elem[0], (elem[3], elem[4], elem[0])) - for elem in raw - ]) + # keymap indexes by integer index... + self._keymap = dict([ + (elem[0], (elem[3], elem[4], elem[0])) + for elem in raw + ]) # processors in key order for certain per-row # views like __iter__ and slices -- 2.47.2