Improve Python 3.x compatibility

Mechanical translation of the deprecated except x,y:
construct. the except x as y: construct works with
all python 2.6+ versions

Change-Id: Iad349b8079a01bbd66a22800ae2fcdfcde03b377