summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/util/compat.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-07-14 18:09:54 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-07-14 18:09:54 -0400
commita49ec1cf778811fb3717bd0ace183ba0ea5ba4d4 (patch)
treecee11129e7981610b10a852ad8623d3ba89e9283 /lib/sqlalchemy/util/compat.py
parent5ec6ec9cbb1c29774c50bafed781e649ed481418 (diff)
downloadsqlalchemy-a49ec1cf778811fb3717bd0ace183ba0ea5ba4d4.tar.gz
- Added a "str()" step to the dialect_kwargs iteration for
Python version < 2.6.5, working around the "no unicode keyword arg" bug as these args are passed along as keyword args within some reflection processes. fixes #3123
Diffstat (limited to 'lib/sqlalchemy/util/compat.py')
-rw-r--r--lib/sqlalchemy/util/compat.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 40f7b2922..35dca92ff 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -18,6 +18,7 @@ py33 = sys.version_info >= (3, 3)
py32 = sys.version_info >= (3, 2)
py3k = sys.version_info >= (3, 0)
py2k = sys.version_info < (3, 0)
+py265 = sys.version_info >= (2, 6, 5)
jython = sys.platform.startswith('java')
pypy = hasattr(sys, 'pypy_version_info')
win32 = sys.platform.startswith('win')
@@ -34,6 +35,12 @@ else:
except ImportError:
import pickle
+# work around http://bugs.python.org/issue2646
+if py265:
+ safe_kwarg = lambda arg: arg
+else:
+ safe_kwarg = str
+
ArgSpec = collections.namedtuple("ArgSpec",
["args", "varargs", "keywords", "defaults"])