- query strings in unicode URLs get keys encoded to ascii

for **kwargs compat

diff --git a/CHANGES b/CHANGES
index 17736daa29052bab8262d3e673e3fe07c544f185..fc8077167f0a137ed7870ba0d56c59a7f8f4c377 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,8 @@
       dbapis [ticket:505]
     - sending None as an argument to func.<something> will produce
       an argument of NULL
+    - query strings in unicode URLs get keys encoded to ascii
+      for **kwargs compat
 - orm:
     - corresponding to label/bindparam name generataion, eager loaders 
       generate deterministic names for the aliases they create using 

diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py
index 353a9f8406a75d515fcb9ff6bf3c810489775444..edb8cf32e8a559777c1cc9b1cf0745689e3f10f5 100644 (file)
--- a/lib/sqlalchemy/engine/url.py
+++ b/lib/sqlalchemy/engine/url.py
@@ -131,6 +131,8 @@ def _parse_rfc1738_args(name):
             tokens = database.split(r"?", 2)
             database = tokens[0]
             query = (len(tokens) > 1 and dict( cgi.parse_qsl(tokens[1]) ) or None)
+            if query is not None:
+                query = dict([(k.encode('ascii'), query[k]) for k in query])
         else:
             query = None
         opts = {'username':username,'password':password,'host':host,'port':port,'database':database, 'query':query}