Use Python 3.x compatible except construct

except x,y: can be rewritten as except x as y: which
works with all Python versions >= 2.6

Change-Id: I3fb2dd9c0e1c292accffc934e45983cb9e12b171
Merge "Use Python 3.x compatible except construct"