summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine/result.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/engine/result.py')
-rw-r--r--lib/sqlalchemy/engine/result.py21
1 files changed, 1 insertions, 20 deletions
diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py
index 3c2e682be..48572c7fe 100644
--- a/lib/sqlalchemy/engine/result.py
+++ b/lib/sqlalchemy/engine/result.py
@@ -25,8 +25,6 @@ from ..util import py2k
if _baserow_usecext:
from sqlalchemy.cresultproxy import tuplegetter
-
- _row_as_tuple = tuplegetter
else:
def tuplegetter(*indexes):
@@ -37,16 +35,6 @@ else:
else:
return lambda row: (it(row),)
- def _row_as_tuple(*indexes):
- # circumvent LegacyRow.__getitem__ pointing to
- # _get_by_key_impl_mapping for now. otherwise we could
- # use itemgetter
- getters = [
- operator.methodcaller("_get_by_int_impl", index)
- for index in indexes
- ]
- return lambda rec: tuple([getter(rec) for getter in getters])
-
class ResultMetaData(object):
"""Base for metadata about result rows."""
@@ -71,13 +59,6 @@ class ResultMetaData(object):
assert raiseerr
util.raise_(KeyError(key), replace_context=err)
- def _warn_for_nonint(self, key):
- util.warn_deprecated_20(
- "Retrieving row members using strings or other non-integers is "
- "deprecated; use row._mapping for a dictionary interface "
- "to the row"
- )
-
def _raise_for_nonint(self, key):
raise TypeError(
"TypeError: tuple indices must be integers or slices, not %s"
@@ -104,7 +85,7 @@ class ResultMetaData(object):
def _row_as_tuple_getter(self, keys):
indexes = self._indexes_for_keys(keys)
- return _row_as_tuple(*indexes)
+ return tuplegetter(*indexes)
class RMKeyView(collections_abc.KeysView):