Merge pull request #80 from 5IGI0/master

add IPv6 support

CHANGELOG

@@ -1,3 +1,6 @@
+3.1
+    * Added IPv6 support
+
 3.0
     * Drop support for python 2 and python 3.4; you may use version 2.3 or prior for outdated python versions.
 

mcstatus/protocol/connection.py

@@ -1,6 +1,7 @@
 import socket
 import struct
 
+from ..scripts.address_tools import ip_type
 
 class Connection:
     def __init__(self):
@@ -160,7 +161,7 @@ class UDPSocketConnection(Connection):
     def __init__(self, addr, timeout=3):
         Connection.__init__(self)
         self.addr = addr
-        self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        self.socket = socket.socket(socket.AF_INET if ip_type(addr[0]) == 4 else socket.AF_INET6, socket.SOCK_DGRAM)
         self.socket.settimeout(timeout)
 
     def flush(self):

mcstatus/scripts/address_tools.py

@@ -0,0 +1,15 @@
+import socket
+from urllib.parse import urlparse
+from ipaddress import ip_address
+
+def ip_type(address):
+    try:
+        return ip_address(address).version
+    except ValueError:
+        return None
+
+def parse_address(address):
+    tmp = urlparse("//"+address)
+    if not tmp.hostname:
+        raise ValueError("Invalid address '%s'" % address)
+    return (tmp.hostname, tmp.port)

mcstatus/server.py

@@ -1,6 +1,7 @@
 from mcstatus.pinger import ServerPinger
 from mcstatus.protocol.connection import TCPSocketConnection, UDPSocketConnection
 from mcstatus.querier import ServerQuerier
+from mcstatus.scripts.address_tools import parse_address
 import dns.resolver
 
 
@@ -11,14 +12,7 @@ def __init__(self, host, port=25565):
 
     @staticmethod
     def lookup(address):
-        host = address
-        port = None
-        if ":" in address:
-            parts = address.split(":")
-            if len(parts) > 2:
-                raise ValueError("Invalid address '%s'" % address)
-            host = parts[0]
-            port = int(parts[1])
+        host, port = parse_address(address)
         if port is None:
             port = 25565
             try:

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name='mcstatus',
-    version='3.0.0',
+    version='3.1.0',
     author='Nathan Adams',
     author_email='[email protected]',
     url='https://pypi.python.org/pypi/mcstatus',