From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 28 Apr 2013 16:55:22 +0000 (-0400)
Subject: result
X-Git-Tag: rel_0_9_0b1~304^2~13^2~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d37431d7a5f7c930527ad9418756d102adebffdb;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

result
---

diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py
index 0bd5014233..65ce3b7423 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,