changes for 3.0

[monitor.git] / nodesets.py

diff --git a/nodesets.py b/nodesets.py
index 85bf9b7..ea69d6b 100755 (executable)
--- a/nodesets.py
+++ b/nodesets.py
@@ -1,25 +1,24 @@
 #!/usr/bin/python
 
-from config import config as cfg
 import sys
 import os
 from sets import Set
-from optparse import OptionParser
+import parser as parsermodule
+import util.file
 
 def main():
-       parser = OptionParser()
+       parser = parsermodule.getParser()
        parser.set_defaults(operation="and",)
        parser.add_option("", "--operation", dest="operation", metavar="and", 
                                                help="""Which operation to perform on the two sets.  (and, or, minus""")
 
-       config = cfg(parser)
-       config.parse_args()
+       config = parsermodule.parse_args(parser)
 
        f1 = config.args[0]
        f2 = config.args[1]
 
-       s1 = config.getListFromFile(f1)
-       s2 = config.getListFromFile(f2)
+       s1 = util.file.getListFromFile(f1)
+       s2 = util.file.getListFromFile(f2)
 
        s = nodesets(config.operation, s1, s2)
 
@@ -46,3 +45,6 @@ def nodesets(operation, s1, s2):
                print "Unknown operation: %s " % operation
        
        return []
+
+if __name__ == "__main__":
+       main()