Pass PSet or dict to Module proxy

When using new syntax to create a module, can now pass a PSet or
dict in the same way as one could using the old syntax.

FWCore/ParameterSet/python/ModulesProxy.py

@@ -7,10 +7,10 @@ def __init__(self, package, name):
         self._package = package
         self._name = name
         self._caller = None
-    def __call__(self,**kwargs):
+    def __call__(self,*arg, **kwargs):
         if not self._caller:
             self._caller = getattr(importlib.import_module(self._package+'.'+self._name),self._name)
-        return self._caller(**kwargs)
+        return self._caller(*arg, **kwargs)
 
 
 def _setupProxies(fullName:str):

FWCore/ParameterSet/src/ConfigurationDescriptions.cc

@@ -191,7 +191,7 @@ namespace edm {
     }
     outFile << "import FWCore.ParameterSet.Config as cms\n\n";
     outFile << "def " << pluginName
-            << "(**kwargs):\n"
+            << "(*args, **kwargs):\n"
                "  mod = cms."
             << baseType_ << "('" << pluginName_ << "'";
 
@@ -201,8 +201,9 @@ namespace edm {
     iDesc.writeCfi(outFile, startWithComma, indentation, ops);
 
     outFile << ")\n"
-               "  for k,v in kwargs.items():\n"
-               "    setattr(mod, k, v)\n"
+               "  for a in args:\n"
+               "    mod.update_(a)\n"
+               "  mod.update_(kwargs)\n"
                "  return mod\n";
 
     outFile.close();