summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-04-28 12:55:22 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-04-28 12:55:22 -0400
commitd37431d7a5f7c930527ad9418756d102adebffdb (patch)
treeedb4cb779b4fde856f7415ba27d7d0c9cef218fc /lib/sqlalchemy/engine
parent1c647a879cbec0a301eb2cb021a30553abdced54 (diff)
downloadsqlalchemy-d37431d7a5f7c930527ad9418756d102adebffdb.tar.gz
result
Diffstat (limited to 'lib/sqlalchemy/engine')
-rw-r--r--lib/sqlalchemy/engine/result.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py
index 0bd501423..65ce3b742 100644
--- a/lib/sqlalchemy/engine/result.py
+++ b/lib/sqlalchemy/engine/result.py
@@ -274,7 +274,7 @@ class ResultMetaData(object):
def _key_fallback(self, key, raiseerr=True):
map = self._keymap
result = None
- if isinstance(key, str):
+ if isinstance(key, util.string_types):
result = map.get(key if self.case_sensitive else key.lower())
# fallback for targeting a ColumnElement to a textual expression
# this is a rare use case which only occurs when matching text()
@@ -329,7 +329,7 @@ class ResultMetaData(object):
'_pickled_keymap': dict(
(key, index)
for key, (processor, obj, index) in self._keymap.items()
- if isinstance(key, (str, int))
+ if isinstance(key, util.string_types + util.int_types)
),
'keys': self.keys,
"case_sensitive": self.case_sensitive,