Merge pull request #11997 from ericvaandering/fix_standarderror

StandardError is now Exception

CalibMuon/DTCalibration/python/Workflow/crabStatusFromReport.py

@@ -57,7 +57,7 @@ def queryStatusXML(filename):
 
     try:
         report = loadIMProvFile(filename)
-    except StandardError, ex:
+    except Exception, ex:
         msg = "Error reading CRAB Status Report: %s\n" % filename
         msg += str(ex)
         raise RuntimeError, msg

Geometry/TrackerCommonData/data/Materials/insertMaterial.py

@@ -36,7 +36,7 @@ def readFractions(fileName, materialMap):
         for fraction in result[material][1]:
             sum+= result[material][1][fraction]
         if math.fabs(sum - 1.0) > maxDist:
-            raise StandardError, "Material Fractions do not add up to 100%: "+ material+" "+str(sum)
+            raise Exception, "Material Fractions do not add up to 100%: "+ material+" "+str(sum)
     return result
 
 #get a source:material from the [material] only
@@ -68,7 +68,7 @@ def getSection(rootNode, name):
         if node.nodeName == name:
             result = node
     if result == None:
-        raise StandardError, "Could not find: \""+name+"\" in childnodes of the rootNode!"
+        raise Exception, "Could not find: \""+name+"\" in childnodes of the rootNode!"
     return result          
 
 #returns a map of [name] nodes by their names. stating from rootNode
@@ -172,9 +172,9 @@ def main():
     (options, args) = optParser.parse_args()
 
     if options.titlesFile == None:
-        raise StandardError, "no .titles File given!"
+        raise Exception, "no .titles File given!"
     if options.xmlFile == None:
-        raise StandardError, "no .xml File given!"
+        raise Exception, "no .xml File given!"
     if options.output == None:
         options.output = "materialOutput.xml"
     if options.materialMap == None:

Geometry/TrackerCommonData/data/Materials/twikiExport.py

@@ -6,7 +6,7 @@
 class Constituent:
     def __init__(self, line, predefinedMaterials):
         if  len(line.split('"')) < 5 or len(line.split('"')[4].split()) < 3:
-            raise StandardError , "not a well formed Constituent: "+constString
+            raise Exception , "not a well formed Constituent: "+constString
         self.theDescription = line.split('"')[1]
         self.theName = line.split('"')[3]
         self.theCount = float(line.split('"')[4].split()[1])
@@ -23,11 +23,11 @@ def __str__(self):
 class Material:
     def __init__(self, matString, comment):
         if matString == "" or not matString[0] == "#":
-            raise StandardError , "not a valid material Definition: "+matString
+            raise Exception , "not a valid material Definition: "+matString
         line = matString[1:]
 
         if    len( line.split('"') ) < 5 or len( line.split('"')[4].split() ) < 2:
-            raise StandardError , "not a well formed Material Definition: "+matString            
+            raise Exception , "not a well formed Material Definition: "+matString            
         self.theDescription = line.split('"')[1]
         self.theName = line.split('"')[3]
         self.theMcVolume = float(line.split('"')[4].split()[0])
@@ -72,13 +72,13 @@ def getMass(self):
 
     def addConstituent(self, constString, predefinedMaterials):
         if constString  == "" or not constString[0] == "*":
-            raise StandardError , "not a valid Constituent: "+constString
+            raise Exception , "not a valid Constituent: "+constString
         line = constString[1:]
         self.theConstituents.append( Constituent(line, predefinedMaterials) )
 
         number = int( line.split('"')[0].split()[0] )
         if not len(self.theConstituents) == number:
-            raise StandardError, "Constituent Number mismatch for "+str(len(self.theConstituents))+" in: "+line
+            raise Exception, "Constituent Number mismatch for "+str(len(self.theConstituents))+" in: "+line
 
     def __str__(self):
         result = "[ "+self.theName+" Description: "+self.theDescription+" MC-Volume:"+str(self.theMcVolume)+"\n"
@@ -191,7 +191,7 @@ def main():
     (options, args) = optParser.parse_args()
 
     if options.inFile == None:
-        raise StandardError, "no .in File given!"
+        raise Exception, "no .in File given!"
     if options.output == None:
         options.output = options.inFile.replace(".in",".twiki")
     if options.config == None:

PhysicsTools/PatAlgos/python/tools/helpers.py

@@ -224,7 +224,7 @@ def _newLabel(self, label):
             if label[-len(self._removePostfix):] == self._removePostfix:
                 label = label[0:-len(self._removePostfix)]
             else:
-                raise StandardError("Tried to remove postfix %s from label %s, but it wasn't there" % (self._removePostfix, label))
+                raise Exception("Tried to remove postfix %s from label %s, but it wasn't there" % (self._removePostfix, label))
         return label + self._postfix
 
     def __appendToTopSequence(self, visitee):

PhysicsTools/PatUtils/python/tools/runMETCorrectionsAndUncertainties.py

@@ -733,7 +733,7 @@ def removePostfix(self, name, postfix):
         if baseName[-len(postfix):] == postfix:
             baseName = baseName[0:-len(postfix)]
         else:
-            raise StandardError("Tried to remove postfix %s from %s, but it wasn't there" % (postfix, baseName))
+            raise Exception("Tried to remove postfix %s from %s, but it wasn't there" % (postfix, baseName))
 
         return baseName
 

PhysicsTools/PythonAnalysis/python/cmstools.py

@@ -170,7 +170,7 @@ def __call__(self):
         return self._buffer
 
 
-class cmserror(exceptions.StandardError):
+class cmserror(exceptions.Exception):
     def __init__(self, message):
           length = len(message)+7   #7=len("ERROR: ")
           print "="*length

RecoHI/HiEgammaAlgos/python/HiHelperTools.py

@@ -158,12 +158,12 @@ def leave(self,visitee):
             if self._waitForSequenceToClose == visitee.label():
                 self._waitForSequenceToClose = None
             if not isinstance(self._sequenceStack[-1], cms.Sequence):
-                raise StandardError, "empty Sequence encountered during cloneing. sequnece stack: %s"%self._sequenceStack
+                raise Exception, "empty Sequence encountered during cloneing. sequnece stack: %s"%self._sequenceStack
             self.__appendToTopSequence( self._sequenceStack.pop() )
 
     def clonedSequence(self):
         if not len(self._sequenceStack) == 1:
-            raise StandardError, "someting went wrong, the sequence stack looks like: %s"%self._sequenceStack
+            raise Exception, "someting went wrong, the sequence stack looks like: %s"%self._sequenceStack
         for label in self._moduleLabels:
             massSearchReplaceAnyInputTag(self._sequenceStack[-1], label, label+self._postfix, moduleLabelOnly=True, verbose=False)
         self._moduleLabels = [] #prevent the InputTag replacement next time this is called.
@@ -175,7 +175,7 @@ def __appendToTopSequence(self, visitee):#this is darn ugly because empty cms.Se
             newSequenceLabel = oldSequenceLabel + self._postfix
             self._sequenceStack.append(cms.Sequence(visitee))
             if hasattr(self._process, newSequenceLabel):
-                raise StandardError("Cloning the sequence "+self._sequenceStack[-1].label()+" would overwrite existing object." )
+                raise Exception("Cloning the sequence "+self._sequenceStack[-1].label()+" would overwrite existing object." )
             setattr(self._process, newSequenceLabel, self._sequenceStack[-1])
             self._sequenceLabels.append(oldSequenceLabel)
         else: