@@ -44,7 +44,7 @@ def get_yamlconfig(configPath):
4444 return {}
4545
4646 try :
47- return yaml .load (open (configPath ).read ())
47+ return yaml .load (open (configPath ).read (), Loader = yaml . FullLoader )
4848 except :
4949 return {}
5050
@@ -290,7 +290,7 @@ def error_logs(workflow):
290290 if not wf_stepinfo :
291291 return error_logs
292292
293- for stepname , stepdata in wf_stepinfo .iteritems ():
293+ for stepname , stepdata in wf_stepinfo .items ():
294294 _taskName = stepname .split ('/' )[- 1 ]
295295 # Get the errors from both 'jobfailed' and 'submitfailed' details
296296 for error , sitedata in [
@@ -301,7 +301,7 @@ def error_logs(workflow):
301301 continue
302302 _errorcode = int (error )
303303
304- for _sitename , siteinfo in sitedata .iteritems ():
304+ for _sitename , siteinfo in sitedata .items ():
305305 _errorsamples = list ()
306306
307307 for sample in siteinfo ['samples' ]:
@@ -383,18 +383,18 @@ def error_summary(workflow):
383383 if not errorInfo :
384384 return error_summary
385385
386- for fullTaskName , taskErrors in errorInfo .iteritems ():
386+ for fullTaskName , taskErrors in errorInfo .items ():
387387 taskName = fullTaskName .split ('/' )[- 1 ]
388388 if not taskName :
389389 continue
390390
391391 errorList = list ()
392392 noReportSite = list (taskErrors .get ('NotReported' , {}).keys ())
393- for errorCode , siteCnt in taskErrors .iteritems ():
393+ for errorCode , siteCnt in taskErrors .items ():
394394 if errorCode == 'NotReported' :
395395 continue
396396
397- for siteName , counts in siteCnt .iteritems ():
397+ for siteName , counts in siteCnt .items ():
398398 errorList .append ({
399399 'errorCode' : int (errorCode ),
400400 'siteName' : siteName ,
@@ -457,16 +457,16 @@ def populate_error_for_workflow(workflow):
457457 workflow_summary ['transitions' ] = requestTransition
458458
459459 nfailure = 0
460- for agent , agentdata in agentJobInfo .iteritems ():
460+ for agent , agentdata in agentJobInfo .items ():
461461 status = agentdata .get ('status' , {})
462462 tasks = agentdata .get ('tasks' , {})
463463 if not all ([status , tasks ]):
464464 continue
465465
466- for ftype , num in status .get ('failure' , {}).iteritems ():
466+ for ftype , num in status .get ('failure' , {}).items ():
467467 nfailure += num
468468
469- for taskFullName , taskData in tasks .iteritems ():
469+ for taskFullName , taskData in tasks .items ():
470470 taskName = taskFullName .split ('/' )[- 1 ]
471471
472472 inputTask = None
@@ -479,13 +479,13 @@ def populate_error_for_workflow(workflow):
479479 taskSiteError = dict ()
480480
481481 if taskStatus and taskStatus .get ('failure' , {}):
482- for site , siteData in taskData .get ('sites' , {}).iteritems ():
482+ for site , siteData in taskData .get ('sites' , {}).items ():
483483 errCnt = 0
484484 errCnts = siteData .get ('failure' , {})
485485 if not errCnts :
486486 continue
487487
488- for ftype , cnt in errCnts .iteritems ():
488+ for ftype , cnt in errCnts .items ():
489489 errCnt += cnt
490490
491491 taskSiteError [site ] = errCnt
@@ -499,7 +499,7 @@ def populate_error_for_workflow(workflow):
499499 if 'siteErrors' not in _task .keys ():
500500 _task ["siteErrors" ] = taskSiteError
501501 else :
502- for site , errors in taskSiteError .iteritems ():
502+ for site , errors in taskSiteError .items ():
503503 if site in _task ["siteErrors" ].keys ():
504504 _task ["siteErrors" ][site ] += errors
505505 else :
@@ -517,7 +517,7 @@ def populate_error_for_workflow(workflow):
517517
518518 # remove tasks that does not have any error
519519 taskToDel = list ()
520- for taskname , taskinfo in workflow_summary ['tasks' ].iteritems ():
520+ for taskname , taskinfo in workflow_summary ['tasks' ].items ():
521521 if 'siteErrors' in taskinfo and (not taskinfo ['siteErrors' ]):
522522 taskToDel .append (taskname )
523523 for taskname in taskToDel :
@@ -531,17 +531,17 @@ def populate_error_for_workflow(workflow):
531531 wf_errorLog = error_logs (workflow )
532532
533533 # add information from errorSummary
534- for taskName , taskErrors in wf_errorSummary .iteritems ():
534+ for taskName , taskErrors in wf_errorSummary .items ():
535535 if taskName in workflow_summary ['tasks' ].keys ():
536536 workflow_summary ['tasks' ][taskName ].update (taskErrors )
537537
538538 # add information from errorLog
539- for taskName , taskErrorLogInfo in wf_errorLog .iteritems ():
539+ for taskName , taskErrorLogInfo in wf_errorLog .items ():
540540
541541 if taskName not in workflow_summary ['tasks' ].keys ():
542542 continue
543- for errorCode , siteInfo in taskErrorLogInfo .iteritems ():
544- for site , info in siteInfo .iteritems ():
543+ for errorCode , siteInfo in taskErrorLogInfo .items ():
544+ for site , info in siteInfo .items ():
545545
546546 for e in workflow_summary ['tasks' ][taskName ].get ('errors' , []):
547547 if e .get ('siteName' , None ) != site :
@@ -562,13 +562,13 @@ def populate_error_for_workflow(workflow):
562562
563563 # last step, nest in task key(TaskName) as a key-value pair
564564 tasksAsList = []
565- for taskname , taskinfo in workflow_summary ['tasks' ].iteritems ():
565+ for taskname , taskinfo in workflow_summary ['tasks' ].items ():
566566 taskinfo .update ({"name" : taskname })
567567 taskinfo ['siteErrors' ] = [
568568 {
569569 "site" : site ,
570570 "counts" : counts
571- } for site , counts in taskinfo ['siteErrors' ].iteritems ()
571+ } for site , counts in taskinfo ['siteErrors' ].items ()
572572 ] # convert 'siteErrors' from a dict to a list of dict
573573 tasksAsList .append (taskinfo )
574574 workflow_summary ['tasks' ] = tasksAsList
0 commit comments