bitswamp
diff --git a/‎MySQLdb/cursors.py
Copy file name to clipboardExpand all lines: MySQLdb/cursors.py
+6-1Lines changed: 6 additions & 1 deletion b/‎MySQLdb/cursors.py
Copy file name to clipboardExpand all lines: MySQLdb/cursors.py
+6-1Lines changed: 6 additions & 1 deletion
diff --git a/‎tests/test_cursor.py
Copy file name to clipboardExpand all lines: tests/test_cursor.py
+12Lines changed: 12 additions & 0 deletions b/‎tests/test_cursor.py
Copy file name to clipboardExpand all lines: tests/test_cursor.py
+12Lines changed: 12 additions & 0 deletions
@@ -181,7 +181,12 @@ def execute(self, query, args=None):
 
         if args is not None:
             if isinstance(args, dict):
-                args = dict((key, db.literal(item)) for key, item in args.items())
+                nargs = {}
+                for key, item in args.items():
+                    if isinstance(key, unicode):
+                        key = key.encode(db.encoding)
+                    nargs[key] = db.literal(item)
+                args = nargs
             else:
                 args = tuple(map(db.literal, args))
             try:
 
@@ -1,3 +1,5 @@
+from __future__ import print_function, absolute_import
+
 import pytest
 import MySQLdb.cursors
 from configdb import connection_factory
@@ -76,3 +78,13 @@ def test_executemany():
         assert cursor._executed.endswith(b"(3, 4),(5, 6)"), "executemany with %% not in one query"
     finally:
         cursor.execute("DROP TABLE IF EXISTS percent_test")
+
+
+def test_pyparam():
+    conn = connect()
+    cursor = conn.cursor()
+
+    cursor.execute(u"SELECT %(a)s, %(b)s", {u'a': 1, u'b': 2})
+    assert cursor._executed == b"SELECT 1, 2"
+    cursor.execute(b"SELECT %(a)s, %(b)s", {b'a': 3, b'b': 4})
+    assert cursor._executed == b"SELECT 3, 4"