X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nodesets.py;h=ea69d6bcddb701587ce2477b84e093bf56b28e3c;hb=3f501b69f366b8b6c62d35d6aea4ebf5fa0f1192;hp=85bf9b7cbef283854a89691c04e2d2627e291c5b;hpb=d0652340b89d51c6115edb13d5c7c72b34dea66f;p=monitor.git

diff --git a/nodesets.py b/nodesets.py
index 85bf9b7..ea69d6b 100755
--- 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()