Modernize Python 2 code#1121

cclauss wants to merge 2 commits intoTritonDataCenter:masterTritonDataCenter/smartos-live:masterfrom

cclauss:python2-and-python3cclauss/smartos-live:python2-and-python3Copy head branch name to clipboard