Use except x as y instead of except x, y

According to https://docs.python.org/3/howto/pyporting.html the
syntax changed in Python 3.x. The new syntax is usable with
Python >= 2.6 and should be preferred to be compatible with Python3.

Change-Id: If375a4de31d24ab343fb33160ecfbf4d1aaa79b7
Merge "Use except x as y instead of except x, y"