From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 12 Jan 2016 15:49:14 +0000 (-0500)
Subject: - convert keys to str for None not sortable against str on py3k
X-Git-Tag: rel_1_1_0b1~84^2~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2b00f1048e74975a1e14c35580d8f092e812784;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- convert keys to str for None not sortable against str on py3k
---

diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index 628d06183f..0626cb2b45 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -3890,7 +3890,7 @@ class _SchemaTranslateMap(object):
             self.__call__ = schema_for_object
             self.hash_key = ";".join(
                 "%s=%s" % (k, map_[k])
-                for k in sorted(map_)
+                for k in sorted(map_, key=str)
             )
             self.is_default = False
         else: