Merge pull request #45640 from IzaakWN/fix_VarParsing_listdefault

VarParsing: prevent TypeError for default of int/float/bool list

Author: cmsbuild

FWCore/ParameterSet/python/VarParsing.py

@@ -412,8 +412,9 @@ def register (self, name,
             self._lists[name] = []
             # if it's a list, we only want to use the default if it
             # does exist.
-            if len (default):
-                self._lists[name].append (default)
+            if (mytype in [VarParsing.varType.bool, VarParsing.varType.int, VarParsing.varType.float] and \
+               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/BuildFile.xml

@@ -15,3 +15,5 @@
 
 <test name="testFWCoreParameterSetEdmConfigDump" command="run_edmConfigDump.sh"/>
 <test name="testFWCoreParameterSetEdmConfigSplit" command="run_edmConfigSplit.sh"/>
+
+<test name="TestFWCoreParameterSetVarParsingList" command="python3 ${LOCALTOP}/src/FWCore/ParameterSet/test/test_varparsing_list.py"/>

FWCore/ParameterSet/test/test_varparsing_list.py

@@ -0,0 +1,30 @@
+import sys
+from FWCore.ParameterSet.VarParsing import VarParsing
+
+def parse(argv):
+  sys.argv = ['test_varparsing_list.py','maxEvents=100']+argv # emulate user arguments
+  opts = VarParsing('standard')
+  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,-1','myFloats1=3.14,0,0.0,-1.0','myBools1=True,False','myStrs1=foo,bar'])