Merge "fix pep8 problem in env.py"