WIP

libs/ipaddress.py

@@ -1103,7 +1103,7 @@ class _BaseNetwork(_IPAddressBase):
         try:
             # Always false if one is v4 and the other is v6.
             if a._version != b._version:
-                raise TypeError("%s and %s are not of the same version" (a, b))
+                raise TypeError("%s and %s are not of the same version" % (a, b))
             return (b.network_address <= a.network_address and
                     b.broadcast_address >= a.broadcast_address)
         except AttributeError:

views/system.tpl

@@ -154,7 +154,7 @@
 							<tr>
 								<td>{{provider[0]}}</td>
 								<td>{{provider[1] if provider[1] is not None else "Good"}}</td>
-								<td>{{provider[2] if provider[2] is not "now" else "-"}}</td>
+								<td>{{provider[2] if provider[2] != "now" else "-"}}</td>
 							</tr>
 						%end
 						</tbody>