py 2.4 fixes

BrightcoveOS · Jan 29, 2014 · 1615146 · 1615146
1 parent 7953cfb
commit 1615146
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/collectors/jcollectd/collectd_network.py b/src/collectors/jcollectd/collectd_network.py
@@ -324,11 +324,16 @@ def __init__(self, host=None, port=DEFAULT_PORT, multicast=False):
             else:
                 raise ValueError("Unsupported network address family")
 
+            if self.ipv6:
+                sock_type = socket.IPPROTO_IPV6
+            else:
+                sock_type = socket.IPPROTO_IP
+
             self._sock.setsockopt(
-                socket.IPPROTO_IPV6 if self.ipv6 else socket.IPPROTO_IP,
+                sock_type,
                 socket.IP_ADD_MEMBERSHIP, val)
             self._sock.setsockopt(
-                socket.IPPROTO_IPV6 if self.ipv6 else socket.IPPROTO_IP,
+                sock_type,
                 socket.IP_MULTICAST_LOOP, 0)
 
         self._readlist = [self._sock]