modernize the code a bit while retaining Python2.7 compatiblity#46

a-detiste wants to merge 2 commits intofedora-static-analysis:masterfedora-static-analysis/firehose:masterfrom

a-detiste:mastera-detiste/firehose:masterCopy head branch name to clipboard