Merge CMSSW_10_6_X into CMSSW_10_6_DEVEL_X.

cms-sw · Apr 2, 2019 · 4d765b4 · 4d765b4
2 parents ff66f6e + 45df373
commit 4d765b4
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/FWCore/ParameterSet/python/Mixins.py b/FWCore/ParameterSet/python/Mixins.py
@@ -656,9 +656,8 @@ def _itemsFromStrings(strings,converter):
         return (converter(x).value() for x in strings)
 
 def saveOrigin(obj, level):
-    frame = inspect.stack()[level+1]
-    if isinstance(frame,tuple): frame=frame[0] #python3 changes this to a tuple where the first thing is the frame
-    fInfo=inspect.getframeinfo(frame)
+    import sys
+    fInfo = inspect.getframeinfo(sys._getframe(level+1))
     obj._filename = fInfo.filename
     obj._lineNumber =fInfo.lineno