Diff of /branches/MySQLdb-1.2/MySQLdb/MySQLdb/connections.py [r671] .. [r672] Maximize Restore

  Switch to side-by-side view

--- a/branches/MySQLdb-1.2/MySQLdb/MySQLdb/connections.py
+++ b/branches/MySQLdb-1.2/MySQLdb/MySQLdb/connections.py
@@ -151,7 +151,7 @@
 
         kwargs2 = kwargs.copy()
         
-        if kwargs.has_key('conv'):
+        if 'conv' in kwargs:
             conv = kwargs['conv']
         else:
             conv = conversions