re #2 - 2to3

.gitignore

@@ -52,3 +52,5 @@ docs/_build/
 
 # PyBuilder
 target/
+
+.idea/

examples/simple_stateful.py

@@ -1,24 +1,24 @@
-from pyptables import default_tables, restore
-from pyptables.rules import Rule, Accept
-
-# get a default set of tables and chains
-tables = default_tables()
-
-# get the forward chain of the filter tables
-forward = tables['filter']['FORWARD']
-
-# any packet matching an established connection should be allowed
-forward.append(Accept(match='conntrack', ctstate='ESTABLISHED'))
-
-# add rules to the forward chain for DNS, HTTP and HTTPS ports
-forward.append(Accept(proto='tcp', dport='53'))
-forward.append(Accept(proto='tcp', dport='80'))
-forward.append(Accept(proto='tcp', dport='443'))
-
-# any packet not matching a rules will be dropped
-forward.policy = Rule.DROP
-
-# write the rules into the kernel
-restore(tables)
-
-print tables.to_iptables()
+from pyptables import default_tables, restore
+from pyptables.rules import Rule, Accept
+
+# get a default set of tables and chains
+tables = default_tables()
+
+# get the forward chain of the filter tables
+forward = tables['filter']['FORWARD']
+
+# any packet matching an established connection should be allowed
+forward.append(Accept(match='conntrack', ctstate='ESTABLISHED'))
+
+# add rules to the forward chain for DNS, HTTP and HTTPS ports
+forward.append(Accept(proto='tcp', dport='53'))
+forward.append(Accept(proto='tcp', dport='80'))
+forward.append(Accept(proto='tcp', dport='443'))
+
+# any packet not matching a rules will be dropped
+forward.policy = Rule.DROP
+
+# write the rules into the kernel
+restore(tables)
+
+print(tables.to_iptables())

pyptables/__init__.py

@@ -1,10 +1,11 @@
 import re 
 import subprocess
 
-from tables import Tables, Table
-from chains import BuiltinChain, UserChain
-from rules import Rule, Accept, Drop, Jump, Redirect, Return, Log, CustomRule
-from rules.matches import Match
+from pyptables.tables import Tables, Table
+from pyptables.chains import BuiltinChain, UserChain
+from pyptables.rules import Rule, Accept, Drop, Jump, Redirect, Return, Log, CustomRule
+from pyptables.rules.matches import Match
+
 
 def default_tables():
     """Generate a set of iptables containing all the default tables and chains"""

pyptables/__main__.py

@@ -22,4 +22,4 @@
 if '--line-numbers' in sys.argv:
     output = add_line_numbers(output) 
 
-print output
+print(output)

pyptables/chains.py

@@ -1,7 +1,8 @@
 import re
 from collections import namedtuple
 
-from base import DebugObject
+from pyptables.base import DebugObject
+
 
 class AbstractChain(DebugObject, list):
     """Represents an iptables Chain.  Holds a number of Rule objects in a list-like fashion"""
@@ -27,7 +28,7 @@ def to_iptables(self):
                                               'rules': rule_output,
                                               },
                                         )
-        except Exception, e: # pragma: no cover
+        except Exception as e:  # pragma: no cover
             e.iptables_path = getattr(e, 'iptables_path', [])
             e.iptables_path.insert(0, self.name)
             raise

pyptables/rules/__init__.py

@@ -2,7 +2,7 @@
    rules for iptables.
 """
 
-from base import AbstractRule, CustomRule, Rule, CompositeRule
+from pyptables.rules.base import AbstractRule, CustomRule, Rule, CompositeRule
 
 from pyptables.chains import AbstractChain as _AbstractChain
 

pyptables/rules/arguments.py

@@ -222,7 +222,7 @@ def _update_args(self, args, kwargs):
     def __iter__(self):
         kwargs = dict(self.kwargs) # duplicate dictionary, as it is modified below
         for argument in self.known_args:
-            for key in kwargs.keys():
+            for key in kwargs:
                 if argument.matches(key):
                     value = kwargs.pop(key)
                     yield argument.bind(key, value)

pyptables/rules/base.py

@@ -1,9 +1,10 @@
 import itertools
 
-from ..base import DebugObject
+from pyptables.base import DebugObject
+
+from pyptables.rules.arguments import UnboundArgument, ArgumentList
+from pyptables.rules.matches import Match
 
-from arguments import UnboundArgument, ArgumentList
-from matches import Match
 
 class AbstractRule(DebugObject):
     """Represents an iptables rule"""
@@ -19,7 +20,7 @@ def to_iptables(self, prefix=''):
                 'header': self._header(),
                 'rules': self._rule_definition(prefix),
                 }
-        except Exception, e: # pragma: no cover
+        except Exception as e:  # pragma: no cover
             e.iptables_path = getattr(e, 'iptables_path', [])
             e.iptables_path.insert(0, "Rule:\n    created: %s\n    comment: %s" % (self.debug_info(), self.comment))
             raise

pyptables/rules/forwarding/__init__.py

@@ -2,4 +2,4 @@
 rules for iptables.
 """
 
-from base import ForwardingRule
+from pyptables.rules.forwarding.base import ForwardingRule

pyptables/rules/forwarding/locations.py

@@ -3,9 +3,10 @@
    Locations represent a network location.
 """
 
-from ...base import DebugObject
-from ..arguments import ArgumentList
-from hosts import Hosts
+from pyptables.base import DebugObject
+from pyptables.rules.arguments import ArgumentList
+from pyptables.rules.forwarding.hosts import Hosts
+
 
 class Location(DebugObject):
     """Represents a network location"""

pyptables/rules/input/__init__.py

@@ -2,4 +2,4 @@
 rules for iptables.
 """
 
-from base import InputRule
+from pyptables.rules.input.base import InputRule

pyptables/rules/marks.py

@@ -3,7 +3,7 @@
 from functools import partial
 from random import Random
 
-from . import Rule
+from pyptables.rules import Rule
 
 _marks = []
 class Mark(Rule):

pyptables/tables.py

@@ -1,6 +1,7 @@
 from collections import OrderedDict
 
-from base import DebugObject
+from pyptables.base import DebugObject
+
 
 class Tables(DebugObject, OrderedDict):
     """Dictionary like top-level container of iptables, holds a number of Table objects."""
@@ -19,7 +20,7 @@ def to_iptables(self):
                 'header': header,
                 'tables': table_output,
                 }
-        except Exception, e: #pragma: no cover
+        except Exception as e:  # pragma: no cover
             e.iptables_path = getattr(e, 'iptables_path', [])
             e.iptables_path.insert(0, "Tables")
             e.message = "Iptables error at:\n    %s\n\nError message: %s" % ("\n".join(e.iptables_path).replace('\n', '\n    '), e.message)
@@ -64,7 +65,7 @@ def to_iptables(self):
                 'rules': "\n\n".join([result.rules for result in chain_results]),
                 'footer': 'COMMIT'
                 }
-        except Exception, e: #pragma: no cover
+        except Exception as e:  # pragma: no cover
             e.iptables_path = getattr(e, 'iptables_path', [])
             e.iptables_path.insert(0, self.name)
             raise
@@ -78,4 +79,4 @@ def append(self, chain):
         return chain
 
     def __repr__(self):
-        return "<Table: %s - %s>" % (self.name, self.values())
+        return "<Table: %s - %s>" % (self.name, list(self.values()))