[PATCH v2] Python2 to Python3 conversion