diff --git a/libs/ipaddress.py b/libs/ipaddress.py index f2d076684..16f03bfd8 100644 --- a/libs/ipaddress.py +++ b/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: diff --git a/views/system.tpl b/views/system.tpl index 01faaa1a7..56a096c95 100644 --- a/views/system.tpl +++ b/views/system.tpl @@ -154,7 +154,7 @@ {{provider[0]}} {{provider[1] if provider[1] is not None else "Good"}} - {{provider[2] if provider[2] is not "now" else "-"}} + {{provider[2] if provider[2] != "now" else "-"}} %end