[SQL-CVS] r2208 - home/phd/SQLObject/paramstyles/sqlobject/mysql

[<sub...@co...>]

Author: phd
Date: 2007-01-16 07:07:19 -0700 (Tue, 16 Jan 2007)
New Revision: 2208

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
Log:
Merged patches from the revisions 2204:2207 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2007-01-16 14:05:23 UTC (rev 2207)
+++ home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2007-01-16 14:07:19 UTC (rev 2208)
@@ -17,7 +17,7 @@
     dbName = 'mysql'
     schemes = [dbName]
 
-    def __init__(self, db, user, password='', host='localhost', port=None, **kw):
+    def __init__(self, db, user, password='', host='localhost', port=0, **kw):
         global MySQLdb
         if MySQLdb is None:
             import MySQLdb
@@ -35,7 +35,7 @@
         else:
             self.need_unicode = False
         for key in ("unix_socket", "init_command",
-                "read_default_file", "read_default_group"):
+                "read_default_file", "read_default_group", "conv"):
             if key in kw:
                 self.kw[key] = col.popKey(kw, key)
         for key in ("connect_timeout", "compress", "named_pipe", "use_unicode",