argparse migration for PhysicsTools/PythonAnalysis (& cleanup)

PhysicsTools/PythonAnalysis/python/diffProv.py

@@ -4,7 +4,7 @@
 class difference :
 
     def __init__(self,v):
-        self.verbose = v
+        self.verbose = int(v)
         self._diffprocess=[]
         self._sameprocess=()
     def list_diff(self,aList1, aList2, string1, string2):
@@ -14,7 +14,7 @@ def list_diff(self,aList1, aList2, string1, string2):
             for j in range(2,len(aList2)):
                 if (i==j) and (aList1[i]!=aList2[j]):
                     if aList1[i][:(aList1[i].index('=')+1)] == aList2[j][:(aList2[j].index('=')+1)]:
-                        if self.verbose==str(2) or self.verbose==str(1):
+                        if self.verbose==2 or self.verbose==1:
                             str1 = aList1[i][2:aList1[i].index('=')+1] + aList1[i][aList1[i].index('=')+1:]+'  ['+ string1+']'
                             str2 = len(aList1[i][2:aList1[i].index('=')+1])*' '+aList2[j][aList2[j].index('=')+1:]+'  ['+string2+']'
                             print(str1,'\n',str2,'\n')
@@ -80,7 +80,7 @@ def onefilemodules(self,module1,module2,string):
                 for name, value in module1[i] :
                     if (name not in labelList2):
                         print('Process: '+'"'+i+'"'+'\n'+'Module: '+'"'+name+'"')
-                        if  self.verbose==str(2):
+                        if  self.verbose==2:
                             for k in value[1:]:
                                 print(k)
 

PhysicsTools/PythonAnalysis/scripts/edmProvDiff

@@ -9,20 +9,18 @@
 #
 # author:  Annapaola de Cosa
 
-from optparse import OptionParser
+from argparse import ArgumentParser
 import sys
 from subprocess import Popen, PIPE, STDOUT
 from PhysicsTools.PythonAnalysis.readProv import *
 from PhysicsTools.PythonAnalysis.diffProv import *
 
-
-usage = "usage: %prog filename1 filename2"
-parser = OptionParser(usage=usage, version="%prog 0.1")
-parser.add_option("-v", "--verbosity_level", dest="verbose", help="[0] to print short message [1], to print details about the differences of modules common to both files, [2] to print all the details about the differences between the two files")
-(options, args) = parser.parse_args()
-
-if len(args) != 2:
-    parser.error('Please specify two EDM files to compare')
+parser = ArgumentParser()
+parser.add_argument('--version', action='version', version='%(prog)s 0.1')
+parser.add_argument("-v", "--verbosity_level", dest="verbose", choices=(0,1,2), help="[0] to print short message [1], to print details about the differences of modules common to both files, [2] to print all the details about the differences between the two files")
+parser.add_argument("filename1",type=str)
+parser.add_argument("filename2",type=str)
+options = parser.parse_args()
 
 def provenance(args):
     cmd="edmProvDump "+args    
@@ -37,15 +35,11 @@ def provenance(args):
     file.write(provenance)
 
     return s
-try:
-    prov1=provenance(args[0])
-    prov2=provenance(args[1])
-except IndexError:
-    print "Specify input file names\nType 'edmProvDiff -h' to visualize the arguments needed"     
+
+prov1=provenance(options.filename1)
+prov2=provenance(options.filename2)
 f=filereader()
 module1=f.readfile(prov1)
 module2=f.readfile(prov2)
 d=difference(options.verbose)
-d.module_diff(module1,module2,args[0],args[1])
-
-
+d.module_diff(module1,module2,options.filename1,options.filename2)

PhysicsTools/PythonAnalysis/test/test.py

@@ -10,7 +10,7 @@ class testEdmProvDiff(unittest.TestCase):
 
         def setUp(self):
             self._r=filereader()
-            self._d=difference(str(2))
+            self._d=difference(2)
 
         def testStartswith(self):
             """ Check the method startswith() of class filereader