Improve Python 3.x compatibility

Replace the deprecated except x,y: construct with
except x as y:, as that one works with all Python
versions starting with 2.6.x

Change-Id: I13080cfdad32eaef21aa2707fe5d2818bda68535
Merge "Improve Python 3.x compatibility"