another pass onf shebangs

diff --git a/clientbin/sfadump.py b/clientbin/sfadump.py
index d46fbfb..f42615b 100755 (executable)
--- a/clientbin/sfadump.py
+++ b/clientbin/sfadump.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#!/usr/bin/env python3

 
 import sys
 import os
 
 import sys
 import os

diff --git a/clientbin/sfiAddAttribute.py b/clientbin/sfiAddAttribute.py
index de1b8c5..7f33681 100755 (executable)
--- a/clientbin/sfiAddAttribute.py
+++ b/clientbin/sfiAddAttribute.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#!/usr/bin/env python3

 
 import sys
 
 
 import sys
 

diff --git a/clientbin/sfiAddLinks.py b/clientbin/sfiAddLinks.py
index 7cd612c..24284ef 100755 (executable)
--- a/clientbin/sfiAddLinks.py
+++ b/clientbin/sfiAddLinks.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#!/usr/bin/env python3

 
 import sys
 
 
 import sys
 

diff --git a/clientbin/sfiAddSliver.py b/clientbin/sfiAddSliver.py
index 0ae3e84..72b649b 100755 (executable)
--- a/clientbin/sfiAddSliver.py
+++ b/clientbin/sfiAddSliver.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#!/usr/bin/env python3

 
 import sys
 
 
 import sys
 

diff --git a/clientbin/sfiDeleteAttribute.py b/clientbin/sfiDeleteAttribute.py
index 6794d45..d60de40 100755 (executable)
--- a/clientbin/sfiDeleteAttribute.py
+++ b/clientbin/sfiDeleteAttribute.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#!/usr/bin/env python3

 
 import sys
 
 
 import sys
 

diff --git a/clientbin/sfiDeleteSliver.py b/clientbin/sfiDeleteSliver.py
index d3a0112..cc5cf4c 100755 (executable)
--- a/clientbin/sfiDeleteSliver.py
+++ b/clientbin/sfiDeleteSliver.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#!/usr/bin/env python3

 
 import sys
 
 
 import sys
 

diff --git a/clientbin/sfiListLinks.py b/clientbin/sfiListLinks.py
index ed32d24..140cbb6 100755 (executable)
--- a/clientbin/sfiListLinks.py
+++ b/clientbin/sfiListLinks.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#!/usr/bin/env python3

 
 import sys
 from sfa.client.sfi_commands import Commands
 
 import sys
 from sfa.client.sfi_commands import Commands

diff --git a/clientbin/sfiListNodes.py b/clientbin/sfiListNodes.py
index e115b8f..81684bf 100755 (executable)
--- a/clientbin/sfiListNodes.py
+++ b/clientbin/sfiListNodes.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#!/usr/bin/env python3

 
 import sys
 
 
 import sys
 

diff --git a/clientbin/sfiListSlivers.py b/clientbin/sfiListSlivers.py
index 934e293..83edd3c 100755 (executable)
--- a/clientbin/sfiListSlivers.py
+++ b/clientbin/sfiListSlivers.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#!/usr/bin/env python3

 
 import sys
 from sfa.client.sfi_commands import Commands
 
 import sys
 from sfa.client.sfi_commands import Commands

diff --git a/sfa/client/sfi_commands.py b/sfa/client/sfi_commands.py
index d93b396..6ba48a8 100755 (executable)
--- a/sfa/client/sfi_commands.py
+++ b/sfa/client/sfi_commands.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python3
+#!/usr/bin/env python3

 
 import sys
 from optparse import OptionParser
 
 import sys
 from optparse import OptionParser

diff --git a/sfatables/sfatables b/sfatables/sfatables
index 6bf4408..924c905 100755 (executable)
--- a/sfatables/sfatables
+++ b/sfatables/sfatables
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2 
+#!/usr/bin/env python3

 
 # This file parses an sfatables command and generates XML files that parameterize
 # matches and targets. Each such XML file defines a rule. Rules are dropped in directories
 
 # This file parses an sfatables command and generates XML files that parameterize
 # matches and targets. Each such XML file defines a rule. Rules are dropped in directories


@@ -42,7 +42,7 @@ def create_parser(command_dict):
     parser = OptionParser(usage="sfatables [command] [chain] [match] [target]",
                              description='See "man sfatables" for more detail.')
     
     parser = OptionParser(usage="sfatables [command] [chain] [match] [target]",
                              description='See "man sfatables" for more detail.')
     

-    for k in command_dict.keys():
+    for k in list(command_dict.keys()):

         command = command_dict[k]
         for (short_option,long_option) in command.options:
             parser.add_option(short_option,long_option,dest=command.type,action=command.action,const=k,help=command.help,metavar="CHAIN")
         command = command_dict[k]
         for (short_option,long_option) in command.options:
             parser.add_option(short_option,long_option,dest=command.type,action=command.action,const=k,help=command.help,metavar="CHAIN")


@@ -53,7 +53,7 @@ def create_parser_xml_ext(ext_dict):
     parser = OptionParser(usage="sfatables [command] [chain] [match] [target]",
                              description='See "man sfatables" for more detail.')
     
     parser = OptionParser(usage="sfatables [command] [chain] [match] [target]",
                              description='See "man sfatables" for more detail.')
     

-    for k in ext_dict.keys():
+    for k in list(ext_dict.keys()):

         command = ext_dict[k]
         for arg in command.arguments:
             parser.add_option('',"--"+arg['name'],dest=arg['name'],help=arg['help'],metavar=arg['target'])
         command = ext_dict[k]
         for arg in command.arguments:
             parser.add_option('',"--"+arg['name'],dest=arg['name'],help=arg['help'],metavar=arg['target'])


@@ -91,16 +91,16 @@ def main():
             raise Exception("Must specify match for this command")
         match_dict = load_xml_extensions("sfatables.matches",match_dir)
         match_parser = create_parser_xml_ext(match_dict)
             raise Exception("Must specify match for this command")
         match_dict = load_xml_extensions("sfatables.matches",match_dir)
         match_parser = create_parser_xml_ext(match_dict)

-        matches_str = ",".join(match_dict.keys())
+        matches_str = ",".join(list(match_dict.keys()))

         match_parser.add_option('-m','--match',dest='name',help='Match name (one of %s)'%matches_str, metavar = 'MATCH')
         match_parser.add_option('-n','--negate',dest='negate',help='Negate result',action='store_true')
         (match_options, args) = match_parser.parse_args(pargs[1])
         try:
             name = match_options.name
         except Exception:
         match_parser.add_option('-m','--match',dest='name',help='Match name (one of %s)'%matches_str, metavar = 'MATCH')
         match_parser.add_option('-n','--negate',dest='negate',help='Negate result',action='store_true')
         (match_options, args) = match_parser.parse_args(pargs[1])
         try:
             name = match_options.name
         except Exception:

-            print "Must specify match name with -m"
+            print("Must specify match name with -m")

 
 

-        if (match_dict.has_key(name)):
+        if (name in match_dict):

             setattr(match_options, 'arguments', match_dict[name].arguments)
         else:
             raise Exception('Match %s not found'%name)
             setattr(match_options, 'arguments', match_dict[name].arguments)
         else:
             raise Exception('Match %s not found'%name)


@@ -113,16 +113,16 @@ def main():
             raise Exception("Must specify a target for this command")
         target_dict = load_xml_extensions("sfatables.targets",target_dir)
         target_parser = create_parser_xml_ext(target_dict)
             raise Exception("Must specify a target for this command")
         target_dict = load_xml_extensions("sfatables.targets",target_dir)
         target_parser = create_parser_xml_ext(target_dict)

-        targets_str = ",".join(target_dict.keys())
+        targets_str = ",".join(list(target_dict.keys()))

         target_parser.add_option('-j','--jump',dest='name',help='Target name (one of %s)'%targets_str, metavar = 'TARGET')
         target_parser.add_option('-e','--element',dest='element',help='Element name', metavar = 'ELEMENT')
         (target_options, args) = target_parser.parse_args(pargs[2])
         try:
             name = target_options.name
         except Exception:
         target_parser.add_option('-j','--jump',dest='name',help='Target name (one of %s)'%targets_str, metavar = 'TARGET')
         target_parser.add_option('-e','--element',dest='element',help='Element name', metavar = 'ELEMENT')
         (target_options, args) = target_parser.parse_args(pargs[2])
         try:
             name = target_options.name
         except Exception:

-            print "Must specify target name with -j"
+            print("Must specify target name with -j")

 
 

-        if (target_dict.has_key(name)):
+        if (name in target_dict):

             setattr(target_options, 'arguments', target_dict[name].arguments)
         else:
             raise Exception('Target %s not found'%name)
             setattr(target_options, 'arguments', target_dict[name].arguments)
         else:
             raise Exception('Target %s not found'%name)