Add windows support to is_ip

2012-12-01 02:21:01 +00:00 · 2012-12-01 02:21:01 +00:00 · 71183f6c19
parent 0b5b585992
commit 71183f6c19
1 changed files with 11 additions and 3 deletions
--- a/deluge/common.py
+++ b/deluge/common.py
@ -544,6 +544,10 @@ def is_ip(ip):
    import socket
    #first we test ipv4
    try:
+        if windows_check():
+            if socket.inet_aton("%s" % (ip)):
+                return True
+        else:
            if socket.inet_pton(socket.AF_INET, "%s" % (ip)):
                return True
    except socket.error:
@ -551,6 +555,10 @@ def is_ip(ip):
            return False
    #now test ipv6
    try:
+        if windows_check():
+            log.warning("ipv6 check unavailable on windows")
+            return True
+        else:
            if socket.inet_pton(socket.AF_INET6, "%s" % (ip)):
                return True
    except socket.error: