From d1df9e83061a9804fe25b3eccb21cb73e5060add Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 5 Dec 2011 22:48:09 -0500 Subject: [PATCH] Use socket.inet_aton for isIPV4 since Windows doesn't (always?) have inet_pton Closes: Sf#3430008 Signed-off-by: James McCoy Conflicts: src/utils/net.py --- src/utils/net.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/utils/net.py b/src/utils/net.py index 2ce659912..544371acd 100644 --- a/src/utils/net.py +++ b/src/utils/net.py @@ -114,10 +114,7 @@ def isIPV4(s): 0 """ try: - try: - return bool(socket.inet_pton(socket.AF_INET, s)) - except AttributeError: # Running Windows. - return bool(socket.inet_aton(s)) + return bool(socket.inet_aton(s)) except socket.error: return False