]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
result
authorMike Bayer <mike_mp@zzzcomputing.com>
Sun, 28 Apr 2013 16:55:22 +0000 (12:55 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sun, 28 Apr 2013 16:55:22 +0000 (12:55 -0400)
lib/sqlalchemy/engine/result.py

index 0bd50142338b5c6e7bb7d0960ce85ac95315063a..65ce3b742378c0206d1b07bc609a836ff6c3910f 100644 (file)
@@ -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,