@@ -16,14 +16,15 @@ def main():

     socket.close()

 def graphite_connect():

+    (host, port) = ('::1', 2003)

     if len(sys.argv) == 4:

-        socket_args = (sys.argv[2], int(sys.argv[3]))

+        (host, port) = (sys.argv[2], int(sys.argv[3]))

     elif len(sys.argv) == 3:

-        socket_args = (sys.argv[2], 2003)

-    else:

-        socket_args = ('::1', 2003)

-    graphite_socket = socket.socket()

-    graphite_socket.connect(socket_args)

+        host = sys.argv[2]

+    addr_infos = socket.getaddrinfo(host, port, 0, 0, socket.IPPROTO_TCP)

+    _, _, _, _, sockaddr = addr_infos[0]

+    graphite_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM, 0)

+    graphite_socket.connect(sockaddr)

     return graphite_socket

 def get_accounts():