Use separate function for Table6 avail checks.

Author: ldx

iptc/__init__.py

@@ -7,8 +7,9 @@
 .. moduleauthor:: Nilvec <[email protected]>
 """
 
-from ip4tc import Table, Chain, Rule, Match, Target, Policy, IPTCError
-from ip6tc import is_table_available, Table6, Rule6
+from ip4tc import (is_table_available, Table, Chain, Rule, Match, Target,
+                   Policy, IPTCError)
+from ip6tc import is_table6_available, Table6, Rule6
 from xtables import XTablesError
 
 __all__ = []

iptc/ip6tc.py

@@ -15,12 +15,7 @@
 _IFNAMSIZ = 16
 
 
-def is_table_available(name):
-    try:
-        Table(name)
-        return True
-    except IPTCError:
-        pass
+def is_table6_available(name):
     try:
         Table6(name)
         return True
@@ -258,7 +253,7 @@ def save(self, name):
         return self._save(name, self.entry.ipv6)
 
     def _get_tables(self):
-        return [Table6(t) for t in Table6.ALL if is_table_available(t)]
+        return [Table6(t) for t in Table6.ALL if is_table6_available(t)]
     tables = property(_get_tables)
     """This is the list of tables for our protocol."""
 

iptc/test/test_iptc.py

@@ -5,6 +5,7 @@
 
 
 is_table_available = iptc.is_table_available
+is_table6_available = iptc.is_table6_available
 
 
 class TestTable6(unittest.TestCase):
@@ -16,20 +17,20 @@ def tearDown(self):
 
     def test_table6(self):
         filt = None
-        if is_table_available(iptc.Table6.FILTER):
+        if is_table6_available(iptc.Table6.FILTER):
             filt = iptc.Table6("filter")
             self.assertEquals(id(filt), id(iptc.Table6(iptc.Table6.FILTER)))
         security = None
-        if is_table_available(iptc.Table6.SECURITY):
+        if is_table6_available(iptc.Table6.SECURITY):
             security = iptc.Table6("security")
             self.assertEquals(id(security),
                               id(iptc.Table6(iptc.Table6.SECURITY)))
         mangle = None
-        if is_table_available(iptc.Table6.MANGLE):
+        if is_table6_available(iptc.Table6.MANGLE):
             mangle = iptc.Table6("mangle")
             self.assertEquals(id(mangle), id(iptc.Table6(iptc.Table6.MANGLE)))
         raw = None
-        if is_table_available(iptc.Table6.RAW):
+        if is_table6_available(iptc.Table6.RAW):
             raw = iptc.Table6("raw")
             self.assertEquals(id(raw), id(iptc.Table6(iptc.Table6.RAW)))
         if filt and security:
@@ -456,19 +457,19 @@ def test_rule_standard_target(self):
         self.chain.delete_rule(rule)
 
     def test_rule_iterate(self):
-        if is_table_available(iptc.Table6.FILTER):
+        if is_table6_available(iptc.Table6.FILTER):
             for r in (rule for chain in iptc.Table6(iptc.Table6.FILTER).chains
                       for rule in chain.rules if rule):
                 pass
-        if is_table_available(iptc.Table6.RAW):
+        if is_table6_available(iptc.Table6.RAW):
             for r in (rule for chain in iptc.Table6(iptc.Table6.RAW).chains
                       for rule in chain.rules if rule):
                 pass
-        if is_table_available(iptc.Table6.MANGLE):
+        if is_table6_available(iptc.Table6.MANGLE):
             for r in (rule for chain in iptc.Table6(iptc.Table6.MANGLE).chains
                       for rule in chain.rules if rule):
                 pass
-        if is_table_available(iptc.Table6.SECURITY):
+        if is_table6_available(iptc.Table6.SECURITY):
             for r in (rule for chain in
                       iptc.Table6(iptc.Table6.SECURITY).chains
                       for rule in chain.rules if rule):