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.

diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py
index 39f4fc50c903d58ad8ec23dcbab7fa3d306d0c5e..cc4ac74cd5931bcfa7f248ad5ad0beeee1ed5e08 100644 (file)
--- 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