python3 - 2to3 + miscell obvious tweaks

[sfa.git] / wsdl / sfa2wsdl.py

diff --git a/wsdl/sfa2wsdl.py b/wsdl/sfa2wsdl.py
index 6da341d..f6fd2ea 100755 (executable)
--- a/wsdl/sfa2wsdl.py
+++ b/wsdl/sfa2wsdl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 #
 # Sapan Bhatia <sapanb@cs.princeton.edu>
 #
@@ -48,7 +48,6 @@ class WSDLGen:
               return "complete"
          if self.interface_options.aggregate: return "aggregate"
          elif self.interface_options.registry: return "registry"
-         elif self.interface_options.component: return "component"
          else: return "unknown"
 
     def filter_argname(self, argname):
@@ -260,7 +259,7 @@ class WSDLGen:
 
 
     def add_wsdl_services(self):
-        for service in self.services.keys():
+        for service in list(self.services.keys()):
             if (getattr(self.interface_options,service)):
                 service_el = self.wsdl.lastChild.appendChild(self.wsdl.createElement("service"))
                 service_el.setAttribute("name", service)
@@ -326,7 +325,7 @@ class WSDLGen:
 
     def pretty_print(self):
         if (self.wsdl):
-             print xml.dom.minidom.Document.toprettyxml(self.wsdl)
+             print(xml.dom.minidom.Document.toprettyxml(self.wsdl))
         else:
              raise Exception("Empty WSDL")
 
@@ -336,8 +335,6 @@ def main():
                               help="Generate registry.wsdl", metavar="FILE")
     parser.add_option("-a", "--aggregate", action="store_true", dest="aggregate",
                               help="Generate am.wsdl")
-    parser.add_option("-c", "--component", action="store_true", dest="component",
-                              help="Generate cm.wsdl")
     parser.add_option("-g", "--geni-aggregate", action="store_true", dest="geni_am",
                       help="Generate gm.wsdl")
     parser.add_option("-l", "--lite", action="store_true", dest="lite",