Moved forwardtype near action for consistency

qubes/firewall.py

@@ -83,6 +83,15 @@ class Action(RuleChoice):
         return 'action=' + str(self)
 
 
+class ForwardType(RuleOption):
+    external = 'external'
+    internal = 'internal'
+
+    @property
+    def rule(self):
+        return 'forwardtype=' + str(self)
+
+
 class Proto(RuleChoice):
     tcp = 'tcp'
     udp = 'udp'
@@ -183,13 +192,6 @@ class DstPorts(RuleOption):
     def rule(self):
         return 'dstports=' + '{!s}-{!s}'.format(*self.range)
 
-class ForwardType(RuleOption):
-    external = 'external'
-    internal = 'internal'
-
-    @property
-    def rule(self):
-        return 'forwardtype=' + str(self)
 
 class IcmpType(RuleOption):
     def __init__(self, untrusted_value):