147f781
PR#685: Rest of automated conversion from py3 changes Merges #685 https://pagure.io/koji/pull-request/685