VarParsing: skip empty list for int/float/bool list default; add opts.parseArguments to unit test

Author: IzaakWN

FWCore/ParameterSet/python/VarParsing.py

@@ -414,7 +414,7 @@ def register (self, name,
             # if it's a list, we only want to use the default if it
             # does exist.
             if (mytype in [VarParsing.varType.bool, VarParsing.varType.int, VarParsing.varType.float] and \
-               default != "") or len (default): # check type to prevent TypeError for bool/int/float defaults
+               default not in ["",[]]) or len (default): # check type to prevent TypeError for bool/int/float defaults
                 self._lists[name].append (default) # known bug: default can be list
         #######################################
         ## Process any additional directives ##

FWCore/ParameterSet/test/test_varparsing_list.py

@@ -2,25 +2,29 @@
 from FWCore.ParameterSet.VarParsing import VarParsing
 
 def parse(argv):
-  sys.argv = ['test.py','maxEvents=100']+argv # emulate user arguments
+  sys.argv = ['test_varparsing_list.py','maxEvents=100']+argv # emulate user arguments
   opts = VarParsing('standard')
-  def add(n, d, m, t):
-    opts.register(n, d, m, t)
-  add('myInts0',   '',      VarParsing.multiplicity.list, VarParsing.varType.int)
-  add('myInts1',   0,       VarParsing.multiplicity.list, VarParsing.varType.int)
-  add('myInts2',   [0],     VarParsing.multiplicity.list, VarParsing.varType.int)
-  add('myFloats0', '',      VarParsing.multiplicity.list, VarParsing.varType.float)
-  add('myFloats1', 0,       VarParsing.multiplicity.list, VarParsing.varType.float)
-  add('myFloats2', [0],     VarParsing.multiplicity.list, VarParsing.varType.float)
-  add('myBools0',  '',      VarParsing.multiplicity.list, VarParsing.varType.bool)
-  add('myBools1',  True,    VarParsing.multiplicity.list, VarParsing.varType.bool)
-  add('myBools2',  [True],  VarParsing.multiplicity.list, VarParsing.varType.bool)
-  add('myStrs0',   '',      VarParsing.multiplicity.list, VarParsing.varType.string)
-  add('myStrs1',   'foo',   VarParsing.multiplicity.list, VarParsing.varType.string)
-  add('myStrs2',   ['foo'], VarParsing.multiplicity.list, VarParsing.varType.string)
+  opts.register('myInts0',   '',      VarParsing.multiplicity.list, VarParsing.varType.int)
+  opts.register('myInts1',   [],      VarParsing.multiplicity.list, VarParsing.varType.int)
+  opts.register('myInts2',   0,       VarParsing.multiplicity.list, VarParsing.varType.int)
+  opts.register('myInts3',   [0],     VarParsing.multiplicity.list, VarParsing.varType.int)
+  opts.register('myFloats0', '',      VarParsing.multiplicity.list, VarParsing.varType.float)
+  opts.register('myFloats1', [],      VarParsing.multiplicity.list, VarParsing.varType.float)
+  opts.register('myFloats2', 0,       VarParsing.multiplicity.list, VarParsing.varType.float)
+  opts.register('myFloats3', [0],     VarParsing.multiplicity.list, VarParsing.varType.float)
+  opts.register('myBools0',  '',      VarParsing.multiplicity.list, VarParsing.varType.bool)
+  opts.register('myBools1',  [],      VarParsing.multiplicity.list, VarParsing.varType.bool)
+  opts.register('myBools2',  True,    VarParsing.multiplicity.list, VarParsing.varType.bool)
+  opts.register('myBools3',  [True],  VarParsing.multiplicity.list, VarParsing.varType.bool)
+  opts.register('myStrs0',   '',      VarParsing.multiplicity.list, VarParsing.varType.string)
+  opts.register('myStrs1',   [],      VarParsing.multiplicity.list, VarParsing.varType.string)
+  opts.register('myStrs2',   'foo',   VarParsing.multiplicity.list, VarParsing.varType.string)
+  opts.register('myStrs3',   ['foo'], VarParsing.multiplicity.list, VarParsing.varType.string)
+  opts.parseArguments()
+  #print(f">>> Parsed: {sys.argv} -> lists={opts._lists}")
 
 # parse without user arguments
 parse([ ])
 
 # parse with user arguments
-parse(['myInts1=0,1','myBools1=True,False','myStrs1=foo,bar','myStrs2=foo,bar'])
+parse(['myInts1=0,1,-1','myFloats1=3.14,0,0.0,-1.0','myBools1=True,False','myStrs1=foo,bar'])