Add IPv6 support to MySQL connector.

d7ac92dd · Romain Courteaud · Vincent Pelletier · cfe1aaf3 · d7ac92dd · d7ac92dd
Commit d7ac92dd authored Sep 19, 2012 by Romain Courteaud Committed by Vincent Pelletier Sep 19, 2012
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

product/ZMySQLDA/db.py product/ZMySQLDA/db.py +5 -1

product/ZMySQLDDA/db.py product/ZMySQLDDA/db.py +5 -1

No files found.
--- a/product/ZMySQLDA/db.py
+++ b/product/ZMySQLDA/db.py
@@ -225,7 +225,11 @@ class ThreadedDB:
        if '@' in db_host:
            db, host = split(db_host,'@',1)
            kwargs['db'] = db
-            if ':' in host:
+            if host.startswith('['):
+                host, port = split(host[1:], ']', 1)
+                if port.startswith(':'):
+                  kwargs['port'] = int(port[1:])
+            elif ':' in host:
                host, port = split(host,':',1)
                kwargs['port'] = int(port)
            kwargs['host'] = host

--- a/product/ZMySQLDDA/db.py
+++ b/product/ZMySQLDDA/db.py
@@ -222,7 +222,11 @@ class ThreadedDeferredDB:
        if '@' in db_host:
            db, host = split(db_host,'@',1)
            kwargs['db'] = db
-            if ':' in host:
+            if host.startswith('['):
+                host, port = split(host[1:], ']', 1)
+                if port.startswith(':'):
+                  kwargs['port'] = int(port[1:])
+            elif ':' in host:
                host, port = split(host,':',1)
                kwargs['port'] = int(port)
            kwargs['host'] = host